1 files changed, 29 insertions, 13 deletions

diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 664fc731fe26..f22087b7e0cf 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -16,19 +16,18 @@ COMMENT=	A utility used to retrieve very large files over the Internet
 BUILD_DEPENDS=	libwww-config:${PORTSDIR}/www/libwww \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
-BROKEN=		Needs to be converted to use OPTIONS instead of home-grown configure script
-
 MAN1=		jigdo-file.1 jigdo-lite.1 jigdo-mirror.1
 
 USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-libdb --disable-nls --without-gui
 USE_GMAKE=	yes
+CONFIGURE_ENV+=	"CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/db3" \
+		LIBS=-L${LOCALBASE}/lib
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
+OPTIONS=	GUI "Build the gtk2 gui" off \
+		DB3 "Build with BDB3 support" on \
+		NLS "Native Language Support" on
 
 .include <bsd.port.pre.mk>
 
@@ -36,17 +35,34 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 NOT_FOR_ARCHS+=	alpha
 .endif
 
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.jigdo
+.if defined(WITH_GUI)
+CONFIGURE_ARGS+=	--with-gui
+LIB_DEPENDS+=	gtk-x11-2.0:\${PORTSDIR}/x11-toolkits/gtk20
+MAN1+=	jigdo.1
+PLIST_SUB+=	SUB_GUI=""
+.else
+CONFIGURE_ARGS+=	--without-gui
+PLIST_SUB+=	SUB_GUI="@comment "
+.endif
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.if defined(WITH_DB3)
+CONFIGURE_ARGS+=	--with-libdb=-ldb3
+#CONFIGURE_ENV+=	LDFLAGS=-ldb3
+USE_BDB=	3
+.else
+CONFIGURE_ARGS+=	--without-libdb
+.endif
+
+.if defined(WITH_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment"
 .endif
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
 
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
 .include <bsd.port.post.mk>