- Fix build with clang

- Fix build when GUI=on, needs pkgconfig to find GTK libs
- Use options helpers, subs, modernize descriptions
- Support staging

3 files changed, 30 insertions, 35 deletions

diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 320256dd0115..16af53c26223 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Utility used to retrieve large files over the Internet
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
-MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
-
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -23,44 +21,27 @@ WITH_BDB_VER?=	43
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=		GUI BDB NLS
-OPTIONS_DEFAULT=	BDB NLS
-
-GUI_DESC=		Build the gtk2 gui
-BDB_DESC=		Build with Berkeley DB support (for jigdo-file cache)
+OPTIONS_DEFAULT=	BDB
+OPTIONS_SUB=		yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+GUI_DESC=		GTK2 Graphical User Interface
+BDB_DESC=		Berkeley DB support (for jigdo-file cache)
 
-.if ${PORT_OPTIONS:MGUI}
-CONFIGURE_ARGS+=	--with-gui
-LIB_DEPENDS+=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \
-		curl:${PORTSDIR}/ftp/curl
-MAN1+=		jigdo.1
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=--without-gui
-PLIST_SUB+=	GUI="@comment "
-.endif
+GUI_CONFIGURE_WITH=	gui
+GUI_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \
+			libcurl.so:${PORTSDIR}/ftp/curl
+GUI_USES=		pkgconfig
 
-.if ${PORT_OPTIONS:MBDB}
-CONFIGURE_ENV+=	LIBS=-L${BDB_LIB_DIR}
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
-CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME}
-USE_BDB=	${WITH_BDB_VER}
-.else
-CONFIGURE_ARGS+=--without-libdb
-.endif
+BDB_CONFIGURE_ENV=	LIBS=-L${BDB_LIB_DIR}
+BDB_CONFIGURE_ON=	--with-libdb=-l${BDB_LIB_CXX_NAME}
+BDB_CONFIGURE_OFF=	--without-libdb
+BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
+BDB_USE=		BDB=${WITH_BDB_VER}
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jigdo-file
 
 .include <bsd.port.mk>
diff --git a/net-p2p/jigdo/files/patch-src__compat.hh b/net-p2p/jigdo/files/patch-src__compat.hh
new file mode 100644
index 000000000000..ecbf5d6dbc4b
--- /dev/null
+++ b/net-p2p/jigdo/files/patch-src__compat.hh
@@ -0,0 +1,10 @@
+--- ./src/compat.hh.orig	2013-12-27 16:00:53.907143596 +0100
++++ ./src/compat.hh	2013-12-27 16:01:15.205152700 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <string>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd-jigdo.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
diff --git a/net-p2p/jigdo/pkg-plist b/net-p2p/jigdo/pkg-plist
index a58530c27dec..8bbd0183bddd 100644
--- a/net-p2p/jigdo/pkg-plist
+++ b/net-p2p/jigdo/pkg-plist
@@ -1,8 +1,12 @@
 bin/jigdo-file
 bin/jigdo-lite
 bin/jigdo-mirror
+man/man1/jigdo-file.1.gz
+man/man1/jigdo-lite.1.gz
+man/man1/jigdo-mirror.1.gz
 share/jigdo/debian-mirrors.jigdo
 %%GUI%%bin/jigdo
+%%GUI%%man/man1/jigdo.1.gz
 %%GUI%%share/jigdo/COPYING
 %%GUI%%share/jigdo/pixmaps/close.png
 %%GUI%%share/jigdo/pixmaps/jigdo-logo.png