Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Feb 2014 23:39:45 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r343410 - head/ftp/pavuk
Message-ID:  <201402082339.s18NdjVV054217@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Sat Feb  8 23:39:44 2014
New Revision: 343410
URL: http://svnweb.freebsd.org/changeset/ports/343410
QAT: https://qat.redports.org/buildarchive/r343410/

Log:
  - Add stage support
  - Add DANTE, NLS and GTK2 options
  - Use options helpers
  - Add LICENSE

Modified:
  head/ftp/pavuk/Makefile
  head/ftp/pavuk/pkg-plist

Modified: head/ftp/pavuk/Makefile
==============================================================================
--- head/ftp/pavuk/Makefile	Sat Feb  8 23:31:37 2014	(r343409)
+++ head/ftp/pavuk/Makefile	Sat Feb  8 23:39:44 2014	(r343410)
@@ -10,45 +10,33 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP, FTP, and Gopher mirroring tool
 
+LICENSE=	GPLv2
+
 USE_BZIP2=	yes
-WANT_GNOME=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-locale-dir=${PREFIX}/share/locale \
 		--disable-debug --disable-gnome --disable-js \
 		--enable-utf-8 --enable-threads
 
-MAN1=		pavuk.1
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DANTE GTK2 NLS
+DANTE_DESC=	Enable SOCKS proxy support
+OPTIONS_DEFAULT=	GTK2
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+
+GTK2_CONFIGURE_ENABLE=	gtk
+GTK2_USE=		GNOME=gtk20
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgtk20}!=""
-USE_GNOME+=	gtk20
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-.endif
-
-.if defined(WITH_DANTE)
-LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
-CONFIGURE_ARGS+=	--with-socks-includes=${LOCALBASE}/include \
+DANTE_CONFIGURE_ENABLE=	socks
+DANTE_CONFIGURE_ON=	--with-socks-includes=${LOCALBASE}/include \
 			--with-socks-libraries=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-socks
-.endif
+DANTE_LIB_DEPENDS=	libsocks.so:${PORTSDIR}/net/dante
 
 pre-patch:
 	@${REINPLACE_CMD} -e \
@@ -59,14 +47,12 @@ pre-patch:
 		's|$$(datadir)/icons|$$(pkgdatadir)/icons|g'
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${PREFIX}/etc
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS BUGS CREDITS ChangeLog COPYING MAILINGLIST NEWS \
 	README TODO wget-pavuk.HOWTO
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/ftp/pavuk/pkg-plist
==============================================================================
--- head/ftp/pavuk/pkg-plist	Sat Feb  8 23:31:37 2014	(r343409)
+++ head/ftp/pavuk/pkg-plist	Sat Feb  8 23:39:44 2014	(r343410)
@@ -1,6 +1,7 @@
 bin/pavuk
 bin/pavuk.sh
 bin/tperf.sh
+man/man1/pavuk.1.gz
 etc/pavuk_authinfo.sample
 etc/pavukrc.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402082339.s18NdjVV054217>