aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--news/lottanzb/Makefile38
-rw-r--r--news/lottanzb/pkg-plist4
-rw-r--r--sysutils/LPRng/Makefile16
-rw-r--r--sysutils/e2fsprogs/Makefile6
-rw-r--r--sysutils/kgtk/Makefile2
-rw-r--r--textproc/libtre/Makefile5
6 files changed, 30 insertions, 41 deletions
diff --git a/news/lottanzb/Makefile b/news/lottanzb/Makefile
index 253c3ffe28f9..e5a9786110ce 100644
--- a/news/lottanzb/Makefile
+++ b/news/lottanzb/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for: lottanzb
-# Date created: Mon Feb 02 2009
-# Whom: Zach Thompson <hideo@lastamericanempire.com>
-#
+# Created by: Zach Thompson <hideo@lastamericanempire.com>
# $FreeBSD$
-# $Id$
-#
PORTNAME= lottanzb
PORTVERSION= 0.6
@@ -15,7 +10,7 @@ MASTER_SITES= http://www.lottanzb.org/releases/ \
http://www.c-s.li/ports/
MAINTAINER= ports@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/sabnzbdplus \
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:
- -@update-desktop-database
- -@update-mime-database ${PREFIX}/share/mime
-@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>
diff --git a/news/lottanzb/pkg-plist b/news/lottanzb/pkg-plist
index 3932152f7f27..0d286e193883 100644
--- a/news/lottanzb/pkg-plist
+++ b/news/lottanzb/pkg-plist
@@ -539,9 +539,5 @@ share/mime-info/lottanzb.mime
@dirrm %%DATADIR%%/ui
@dirrm share/lottanzb
@exec mkdir -p %D/share/omf/lottanzb
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@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
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 73a76b4b8b0b..c61231b45215 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: LPRng
-# Date created: 2 Apr 1997
-# Whom: desmo@bandwidth.org
-#
+# Created by: desmo@bandwidth.org
# $FreeBSD$
-#
PORTNAME= LPRng
PORTVERSION= 3.8.35
@@ -64,10 +60,10 @@ MAN1= lpf.1 psbanner.1 lp.1 cancel.1 lprng_certs.1 lprng_index_certs.1 \
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>
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index c289928ac782..582553f00d0f 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -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:' \
diff --git a/sysutils/kgtk/Makefile b/sysutils/kgtk/Makefile
index f55889117df5..45686729e540 100644
--- a/sysutils/kgtk/Makefile
+++ b/sysutils/kgtk/Makefile
@@ -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 "
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 452a3a0e5d26..d56b9231c242 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -29,17 +29,18 @@ PGO_DESC= Enable Profile-Guided Optimization
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 \