svn commit: r316884 - in head: news/lottanzb sysutils/LPRng sysutils/e2fsprogs sysutils/kgtk textproc/libtre

Jason Helfman jgh at FreeBSD.org
Tue Apr 30 07:11:21 UTC 2013 

Author: jgh
Date: Tue Apr 30 07:11:19 2013
New Revision: 316884
URL: http://svnweb.freebsd.org/changeset/ports/316884

Log:
  - USES conversions
  
  Approved by:	portmgr (bapt@)

Modified:
  head/news/lottanzb/Makefile
  head/news/lottanzb/pkg-plist
  head/sysutils/LPRng/Makefile
  head/sysutils/e2fsprogs/Makefile
  head/sysutils/kgtk/Makefile
  head/textproc/libtre/Makefile

Modified: head/news/lottanzb/Makefile
==============================================================================
--- head/news/lottanzb/Makefile	Tue Apr 30 06:28:27 2013	(r316883)
+++ head/news/lottanzb/Makefile	Tue Apr 30 07:11:19 2013	(r316884)
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	lottanzb
-# Date created:		Mon Feb 02 2009
-# Whom:			Zach Thompson <hideo at lastamericanempire.com>
-#
+# Created by: Zach Thompson <hideo at lastamericanempire.com>
 # $FreeBSD$
-# $Id$
-#
 
 PORTNAME=	lottanzb
 PORTVERSION=	0.6
@@ -15,7 +10,7 @@ MASTER_SITES=	http://www.lottanzb.org/re
 		http://www.c-s.li/ports/
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A pyGTK usenet frontend for hellanzb
+COMMENT=	pyGTK usenet frontend for hellanzb
 
 LICENSE=	GPLv3
 
@@ -23,9 +18,9 @@ RUN_DEPENDS=	SABnzbd.py:${PORTSDIR}/news
 		yelp:${PORTSDIR}/x11/yelp \
 		unrar:${PORTSDIR}/archivers/unrar \
 		unzip:${PORTSDIR}/archivers/unzip \
-		${PYTHON_SITELIBDIR}/yenc.py:${PORTSDIR}/news/py-yenc \
-		${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \
-		${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
+		${PYTHON_PKGNAMPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc \
+		${PYTHON_PKGNAMPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_PKGNAMPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
 
 BROKEN=		overwrite a file owned by misc/shared-mime-info: share/mime/application/x-nzb.xml
 
@@ -34,33 +29,32 @@ USE_PYDISTUTILS=yes
 USE_GNOME=	desktopfileutils intltool
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
+USES=		shared-mime-info desktop-file-utils
 
 PORTDOCS=	README NEWS
 
 MAN1=		lottanzb.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/try_to_call(\[".*$$//' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's/.share., \(.man.\)/\1/; s/^ *__stdfiles(attrs, src)//' \
 	${WRKSRC}/distutilsextra/auto.py
 post-install:
-	- at update-desktop-database
-	- at update-mime-database ${PREFIX}/share/mime
 	- at gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/news/lottanzb/pkg-plist
==============================================================================
--- head/news/lottanzb/pkg-plist	Tue Apr 30 06:28:27 2013	(r316883)
+++ head/news/lottanzb/pkg-plist	Tue Apr 30 07:11:19 2013	(r316884)
@@ -539,9 +539,5 @@ share/mime-info/lottanzb.mime
 @dirrm %%DATADIR%%/ui
 @dirrm share/lottanzb
 @exec mkdir -p %D/share/omf/lottanzb
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
- at unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true

Modified: head/sysutils/LPRng/Makefile
==============================================================================
--- head/sysutils/LPRng/Makefile	Tue Apr 30 06:28:27 2013	(r316883)
+++ head/sysutils/LPRng/Makefile	Tue Apr 30 07:11:19 2013	(r316884)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	LPRng
-# Date created:		2 Apr 1997
-# Whom:			desmo at bandwidth.org
-#
+# Created by: desmo at bandwidth.org
 # $FreeBSD$
-#
 
 PORTNAME=	LPRng
 PORTVERSION=	3.8.35
@@ -64,10 +60,10 @@ MAN1=	lpf.1 psbanner.1 lp.1 cancel.1 lpr
 MAN5=	printcap.5 lpd.conf.5 lpd.perms.5
 MAN8=	lpc.8 checkpc.8 lpd.8
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
+.if ${PORT_OPTIONS:MNLS}
+USES+=			gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
@@ -101,7 +97,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/lpd.conf ${SYSCONFDIR}/lpd.conf.sample
 	@${INSTALL_DATA} ${WRKSRC}/lpd.perms ${SYSCONFDIR}/lpd.perms.sample
 	@${INSTALL_DATA} ${WRKSRC}/printcap ${SYSCONFDIR}/printcap.sample
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}/Reference
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 0555 ${DOCSDIR}/PrintingCookbook
@@ -115,4 +111,4 @@ post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Tue Apr 30 06:28:27 2013	(r316883)
+++ head/sysutils/e2fsprogs/Makefile	Tue Apr 30 07:11:19 2013	(r316884)
@@ -50,10 +50,10 @@ MAKE_JOBS_SAFE=	yes
 MAKE_ARGS+=	V=1
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB=	NLS=""
 libintl=	"${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
 .else
@@ -62,6 +62,8 @@ PLIST_SUB=	NLS="@comment "
 libintl=
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch::
 	@${REINPLACE_CMD} -E -e \
 		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \

Modified: head/sysutils/kgtk/Makefile
==============================================================================
--- head/sysutils/kgtk/Makefile	Tue Apr 30 06:28:27 2013	(r316883)
+++ head/sysutils/kgtk/Makefile	Tue Apr 30 07:11:19 2013	(r316884)
@@ -29,7 +29,7 @@ USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "

Modified: head/textproc/libtre/Makefile
==============================================================================
--- head/textproc/libtre/Makefile	Tue Apr 30 06:28:27 2013	(r316883)
+++ head/textproc/libtre/Makefile	Tue Apr 30 07:11:19 2013	(r316884)
@@ -29,17 +29,18 @@ PGO_DESC=	Enable Profile-Guided Optimiza
 
 MAN1=	tre_agrep.1
 
-.include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-Wuninitialized -ffast-math -finline-functions \
 		-fomit-frame-pointer -fexpensive-optimizations \

More information about the svn-ports-all mailing list