Date: Mon, 28 Apr 2014 12:46:39 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352490 - in head: graphics/icoconvert net-im/py-jabber net-p2p/bnbt net/grdesktop net/ldapsh sysutils/testdisk Message-ID: <201404281246.s3SCkdSs031102@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Apr 28 12:46:39 2014 New Revision: 352490 URL: http://svnweb.freebsd.org/changeset/ports/352490 QAT: https://qat.redports.org/buildarchive/r352490/ Log: Stagify a bunch of ports maintained by flz While here: - graphics/icoconvert: * Respect CC * Use modern LIB_DEPENDS - net/grdesktop: * Convert gnomehack to pathfix - net/ldapsh: * Use shebangfix instead of custom post-patch target - net-im/py-jabber: * Use autoplist - net-p2p/bnbt: * Use the options framework * Convert to dos2unix * Respect CXX * Do not renamed base on option - sysutils/testdisk: * Update to 6.14 * Use options helpers * Use modern LIB_DEPENDS * Convert USE_BZIP2 -> USES=tar:bzip2 Deleted: head/net-im/py-jabber/pkg-plist Modified: head/graphics/icoconvert/Makefile head/net-im/py-jabber/Makefile head/net-p2p/bnbt/Makefile head/net-p2p/bnbt/pkg-plist head/net/grdesktop/Makefile head/net/grdesktop/pkg-plist head/net/ldapsh/Makefile head/net/ldapsh/pkg-plist head/sysutils/testdisk/Makefile head/sysutils/testdisk/distinfo Modified: head/graphics/icoconvert/Makefile ============================================================================== --- head/graphics/icoconvert/Makefile Mon Apr 28 12:43:55 2014 (r352489) +++ head/graphics/icoconvert/Makefile Mon Apr 28 12:46:39 2014 (r352490) @@ -9,18 +9,19 @@ MASTER_SITES= http://www.mox.net/downloa http://www.xunix.org/~flz/distfiles/ MAINTAINER= flz@FreeBSD.org -COMMENT= A small utility to convert Windows icon files into .xpm and .png files +COMMENT= Small utility to convert Windows icon files into .xpm and .png files -LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd +LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd + +MAKE_ARGS= CC="${CC}" PLIST_FILES= bin/icoconvert -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|^icoconvert|all|' -e 's|^\(FLAGS=\)|\1-I${LOCALBASE}/include |' \ -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/icoconvert ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/icoconvert ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/net-im/py-jabber/Makefile ============================================================================== --- head/net-im/py-jabber/Makefile Mon Apr 28 12:43:55 2014 (r352489) +++ head/net-im/py-jabber/Makefile Mon Apr 28 12:46:39 2014 (r352490) @@ -9,15 +9,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= jabberpy-${PORTVERSION}-0 MAINTAINER= flz@FreeBSD.org -COMMENT= A Python Jabber library +COMMENT= Python Jabber library USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= jabber.py -PYDISTUTILS_PKGVERSION= 0.3-1 +PYDISTUTILS_AUTOPLIST= yes +PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/jabber.pth -NO_STAGE= yes post-install: - @${ECHO} "jabber" > ${PYTHON_SITELIBDIR}/jabber.pth + @${ECHO} "jabber" > ${STAGEDIR}${PYTHON_SITELIBDIR}/jabber.pth .include <bsd.port.mk> Modified: head/net-p2p/bnbt/Makefile ============================================================================== --- head/net-p2p/bnbt/Makefile Mon Apr 28 12:43:55 2014 (r352489) +++ head/net-p2p/bnbt/Makefile Mon Apr 28 12:46:39 2014 (r352490) @@ -3,54 +3,52 @@ PORTNAME= bnbt PORTVERSION= 8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= http://opensource.depthstrike.com/${PORTNAME}/ DISTNAME= ${SNAPSHOT}-${PORTNAME}${PORTVERSION:C/\.//}-src SNAPSHOT= 20060727 MAINTAINER= flz@FreeBSD.org -COMMENT= A C++ BitTorrent Tracker +COMMENT= C++ BitTorrent Tracker -USES= gmake tar:bzip2 -USE_DOS2UNIX= yes +OPTIONS_DEFINE= MYSQL DOCS + +USES= dos2unix gmake tar:bzip2 SUB_FILES= pkg-message USE_RC_SUBR= bnbt PORTDOCS= footer.html header.html -.if defined(WITH_MYSQL) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MMYSQL} ALL_TARGET= bnbtmysql -PKGNAMESUFFIX= -mysql USE_MYSQL= yes .else ALL_TARGET= bnbt .endif -NO_STAGE= yes -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's|-O2|${CFLAGS} -I${PREFIX}/include| ; \ - s|LFLAGS =|LFLAGS = -L${PREFIX}/lib/mysql|' ${WRKSRC}/Makefile + s|LFLAGS =|LFLAGS = -L${PREFIX}/lib/mysql| ; \ + s|g++|${CXX}|' \ + ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|\([a-z]*\.bnbt\)|${PREFIX}/etc/${PORTNAME}/\1|' \ ${WRKSRC}/config.cpp @${REINPLACE_CMD} -e 's|bnbt.cfg|${PREFIX}/etc/${PORTNAME}/bnbt.cfg|' \ ${WRKSRC}/config.h ${WRKSRC}/config.cpp ${WRKSRC}/tracker.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${PREFIX}/bin/bnbt - ${MKDIR} ${PREFIX}/etc/${PORTNAME} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${STAGEDIR}${PREFIX}/bin/bnbt + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor -.endif - -post-install: - @${MKDIR} /var/log/${PORTNAME} - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} + ${TOUCH} ${STAGEDIR}/var/log/${PORTNAME}/.keep + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${TOUCH} ${STAGEDIR}${ETCDIR}/.keep -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-p2p/bnbt/pkg-plist ============================================================================== --- head/net-p2p/bnbt/pkg-plist Mon Apr 28 12:43:55 2014 (r352489) +++ head/net-p2p/bnbt/pkg-plist Mon Apr 28 12:46:39 2014 (r352490) @@ -1,5 +1,5 @@ bin/bnbt -@exec mkdir -p /var/log/bnbt -@exec mkdir -p %D/etc/bnbt -@dirrmtry etc/bnbt +%%ETCDIR%%/.keep +/var/log/bnbt/.keep +@dirrmtry %%ETCDIR%% @dirrmtry /var/log/bnbt Modified: head/net/grdesktop/Makefile ============================================================================== --- head/net/grdesktop/Makefile Mon Apr 28 12:43:55 2014 (r352489) +++ head/net/grdesktop/Makefile Mon Apr 28 12:46:39 2014 (r352490) @@ -14,21 +14,18 @@ COMMENT= GNOME frontend for the remote d RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop GNU_CONFIGURE= yes -USES= gmake pkgconfig -USE_GNOME= libgnomeui gnomeprefix gnomehack +USES= pathfix gmake pkgconfig +USE_GNOME= libgnomeui gnomeprefix GCONF_SCHEMAS= grdesktop.schemas INSTALLS_OMF= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-keymap-path=${LOCALBASE}/share/rdesktop/keymaps -MAN1= grdesktop.1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|^\(GETTEXT_PACKAGE =\).*|\1 grdesktop|' ${WRKSRC}/po/Makefile.in.in post-install: - @${INSTALL_DATA} ${PREFIX}/share/pixmaps/grdesktop/icon.png ${PREFIX}/share/pixmaps/grdesktop.png + @${INSTALL_DATA} ${STAGEDIR}${PREFIX}/share/pixmaps/grdesktop/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/grdesktop.png .include <bsd.port.mk> Modified: head/net/grdesktop/pkg-plist ============================================================================== --- head/net/grdesktop/pkg-plist Mon Apr 28 12:43:55 2014 (r352489) +++ head/net/grdesktop/pkg-plist Mon Apr 28 12:46:39 2014 (r352490) @@ -1,4 +1,5 @@ bin/grdesktop +man/man1/grdesktop.1.gz share/application-registry/grdesktop.applications share/applications/grdesktop.desktop share/gnome/help/grdesktop/C/grdesktop.xml Modified: head/net/ldapsh/Makefile ============================================================================== --- head/net/ldapsh/Makefile Mon Apr 28 12:43:55 2014 (r352489) +++ head/net/ldapsh/Makefile Mon Apr 28 12:46:39 2014 (r352490) @@ -21,21 +21,13 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} SUB_FILES= pkg-message -MAN1= ldapsh.1 -MAN3= Net::LDAP::Shell.3 Net::LDAP::Config.3 \ - Net::LDAP::Shell::Parse.3 Net::LDAP::Shell::Util.3 - -USES= perl5 +USES= perl5 shebangfix USE_PERL5= configure - -NO_STAGE= yes -post-patch: - ${REINPLACE_CMD} -e "s,/usr/local/bin/perl,${PERL}," ${WRKSRC}/ldapsh +SHEBANG_FILES= ldapsh post-install: - ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/COMMANDS ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${EXAMPLESDIR}/ - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/COMMANDS ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/examples/ldapsh_config ${STAGEDIR}${EXAMPLESDIR}/ .include <bsd.port.mk> Modified: head/net/ldapsh/pkg-plist ============================================================================== --- head/net/ldapsh/pkg-plist Mon Apr 28 12:43:55 2014 (r352489) +++ head/net/ldapsh/pkg-plist Mon Apr 28 12:46:39 2014 (r352490) @@ -20,6 +20,11 @@ bin/ldapsh %%SITE_PERL%%/Net/LDAP/Shell/Util.pm %%SITE_PERL%%/Net/LDAP/Shell/grammar.yp %%SITE_PERL%%/Net/LDAP/Shell/makefile +%%PERL5_MAN3%%/Net::LDAP::Config.3.gz +%%PERL5_MAN3%%/Net::LDAP::Shell.3.gz +%%PERL5_MAN3%%/Net::LDAP::Shell::Parse.3.gz +%%PERL5_MAN3%%/Net::LDAP::Shell::Util.3.gz +man/man1/ldapsh.1.gz %%DOCSDIR%%/COMMANDS %%EXAMPLESDIR%%/ldapsh_config @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ldapsh Modified: head/sysutils/testdisk/Makefile ============================================================================== --- head/sysutils/testdisk/Makefile Mon Apr 28 12:43:55 2014 (r352489) +++ head/sysutils/testdisk/Makefile Mon Apr 28 12:46:39 2014 (r352490) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= testdisk -PORTVERSION= 6.13 -PORTREVISION= 1 +PORTVERSION= 6.14 CATEGORIES= sysutils MASTER_SITES= http://www.cgsecurity.org/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} @@ -10,16 +9,18 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${E MAINTAINER= flz@FreeBSD.org COMMENT= Tool to check and undelete partitions -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_BZIP2= yes +USES= tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib CONFIGURE_ARGS= --without-ewf -MAN8= fidentify.8 testdisk.8 photorec.8 -PLIST_FILES= bin/fidentify bin/testdisk bin/photorec +PLIST_FILES= bin/fidentify bin/testdisk bin/photorec \ + man/man8/fidentify.8.gz man/man8/photorec.8.gz \ + man/man8/testdisk.8.gz + PORTDOCS= * OPTIONS_DEFINE= ICONV PROGSREISERFS NTFS DOCS @@ -32,18 +33,8 @@ NTFSPROGS_DESC= Use ntfsprogs extension PROGSREISERFS_DESC= Use reiserfs extensions # E2FSPROGS "Use ext2fs extensions" off \ -NO_STAGE= yes -.include <bsd.port.pre.mk> - -#.if !defined(NOPORTDOCS) -#DISTFILES+= ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX} -#.endif - -.if ${PORT_OPTIONS:MICONV} -USES= iconv -.else -CONFIGURE_ARGS+=--without-iconv -.endif +ICONV_USES= iconv +ICONV_CONFIGURE_OFF= --without-iconv # e2fsprogs does not provide ext2fs.so any more # since it does not do 'make install-libs' @@ -53,30 +44,17 @@ CONFIGURE_ARGS+=--without-iconv #CONFIGURE_ARGS+=--without-ext2fs #.endif -.if ${PORT_OPTIONS:MNTFS3G} -LIB_DEPENDS+= ntfs-3g:${PORTSDIR}/sysutils/fusefs-ntfs -.else -CONFIGURE_ARGS+=--without-ntfs3g -.endif - -.if ${PORT_OPTIONS:MNTFSPROGS} -LIB_DEPENDS+= ntfs:${PORTSDIR}/sysutils/ntfsprogs -.else -CONFIGURE_ARGS+=--without-ntfs -.endif - -.if ${PORT_OPTIONS:MPROGSREISERFS} -LIB_DEPENDS+= reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs -.else -CONFIGURE_ARGS+=--without-reiserfs -.endif +NTFS3G_LIB_DEPENDS= libntfs-3g.so:${PORTSDIR}/sysutils/fusefs-ntfs +NTFS3G_CONFIGURE_OFF= --without-ntfs3g + +NTFSPROGS_LIB_DEPENDS= libntfs.so:${PORTSDIR}/sysutils/ntfsprogs +NTFS_PROGS_CONFIGURE_ARGS= --without-ntfs + +PROGSREISERFS_LIB_DEPENDS= libreiserfs-0.3.so:${PORTSDIR}/sysutils/progsreiserfs +PROGSREISERFS_CONFIGURE_OFF= --without-reiserfs post-patch: -.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/doc\/testdisk\/html/d' ${WRKSRC}/Makefile.in -.else - @${REINPLACE_CMD} -e '/\/doc\/$$(PACKAGE)-$$(VERSION)/d' ${WRKSRC}/Makefile.in -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/testdisk/distinfo ============================================================================== --- head/sysutils/testdisk/distinfo Mon Apr 28 12:43:55 2014 (r352489) +++ head/sysutils/testdisk/distinfo Mon Apr 28 12:46:39 2014 (r352490) @@ -1,2 +1,2 @@ -SHA256 (testdisk-6.13.tar.bz2) = 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220 -SIZE (testdisk-6.13.tar.bz2) = 560696 +SHA256 (testdisk-6.14.tar.bz2) = a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c +SIZE (testdisk-6.14.tar.bz2) = 620077
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404281246.s3SCkdSs031102>