Subject: Re: pkg/30837: add `nogui' option to net/jigdo (patch privided)
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Jukka Salmi <j+nbsd@2005.salmi.ch>
List: pkgsrc-bugs
Date: 07/26/2005 12:21:02
The following reply was made to PR pkg/30837; it has been noted by GNATS.
From: Jukka Salmi <j+nbsd@2005.salmi.ch>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/30837: add `nogui' option to net/jigdo (patch privided)
Date: Tue, 26 Jul 2005 14:20:05 +0200
--eHhjakXzOLJAF9wJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Lubomir Sedlacik --> pkgsrc-bugs (2005-07-26 11:28:03 +0000):
> could you, please, change the semantics to option 'x11', default on?
> it makes more sense that way and it's also consistent with other
> packages.
Sure, the modified patch is attached and available from
http://salmi.ch/~jukka/patches/pkgsrc/net/jigdo/patch-x11_option
BTW, I choose `nogui' because I found this option in
pkgsrc/mk/defaults/options.description. As for me, `x11' is fine.
Cheers, Jukka
--
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~
--eHhjakXzOLJAF9wJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-x11_option
diff -ruN pkgsrc/net/jigdo.bak/Makefile pkgsrc/net/jigdo/Makefile
--- pkgsrc/net/jigdo.bak/Makefile 2005-07-21 21:59:31.000000000 +0200
+++ pkgsrc/net/jigdo/Makefile 2005-07-26 14:11:19.000000000 +0200
@@ -9,6 +9,20 @@
HOMEPAGE= http://atterer.net/jigdo/
COMMENT= Tool to ease downloading of large files from the Internet
+PKG_OPTIONS_VAR= PKG_OPTIONS.jigdo
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+= --with-gui
+PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.x11
+.else
+CONFIGURE_ARGS+= --without-gui
+.endif
+
CONFIGURE_ARGS+= --without-libdb
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
@@ -16,7 +30,10 @@
#.include "../../databases/db3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pkg-config/buildlink3.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
.include "../../www/libwww/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.endif
.include "../../mk/bsd.pkg.mk"
diff -ruN pkgsrc/net/jigdo.bak/PLIST pkgsrc/net/jigdo/PLIST
--- pkgsrc/net/jigdo.bak/PLIST 2004-02-26 23:55:18.000000000 +0100
+++ pkgsrc/net/jigdo/PLIST 2005-07-26 13:00:16.000000000 +0200
@@ -1,21 +1,10 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/26 22:55:18 agc Exp $
-bin/jigdo
bin/jigdo-file
bin/jigdo-lite
bin/jigdo-mirror
man/man1/jigdo-file.1
man/man1/jigdo-lite.1
man/man1/jigdo-mirror.1
-man/man1/jigdo.1
-share/jigdo/COPYING
share/jigdo/debian-mirrors.jigdo
-share/jigdo/pixmaps/close.png
-share/jigdo/pixmaps/jigdo-logo.png
-share/jigdo/pixmaps/pause.png
-share/jigdo/pixmaps/progress-green.png
-share/jigdo/pixmaps/restart.png
-share/jigdo/pixmaps/start.png
-share/jigdo/pixmaps/stop.png
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/jigdo.mo
-@dirrm share/jigdo/pixmaps
@dirrm share/jigdo
diff -ruN pkgsrc/net/jigdo.bak/PLIST.gui pkgsrc/net/jigdo/PLIST.gui
--- pkgsrc/net/jigdo.bak/PLIST.gui 1970-01-01 01:00:00.000000000 +0100
+++ pkgsrc/net/jigdo/PLIST.gui 2005-07-26 13:00:22.000000000 +0200
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+bin/jigdo
+man/man1/jigdo.1
+share/jigdo/COPYING
+share/jigdo/pixmaps/close.png
+share/jigdo/pixmaps/jigdo-logo.png
+share/jigdo/pixmaps/pause.png
+hare/jigdo/pixmaps/progress-green.png
+share/jigdo/pixmaps/restart.png
+share/jigdo/pixmaps/start.png
+share/jigdo/pixmaps/stop.png
+@dirrm share/jigdo/pixmaps
--eHhjakXzOLJAF9wJ--