svn commit: r338682 - head/archivers/rpm5

Baptiste Daroussin bapt at FreeBSD.org
Sat Jan 4 23:09:37 UTC 2014 

Author: bapt
Date: Sat Jan  4 23:09:36 2014
New Revision: 338682
URL: http://svnweb.freebsd.org/changeset/ports/338682

Log:
  Support stage
  Fix shebang where needed
  Use options helpers
  Stop installing the /usr/src directories

Modified:
  head/archivers/rpm5/Makefile
  head/archivers/rpm5/pkg-plist

Modified: head/archivers/rpm5/Makefile
==============================================================================
--- head/archivers/rpm5/Makefile	Sat Jan  4 22:54:00 2014	(r338681)
+++ head/archivers/rpm5/Makefile	Sat Jan  4 23:09:36 2014	(r338682)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	5.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm5.org/files/rpm/rpm-${PORTVERSION:R}/
 PKGNAMESUFFIX=	5
@@ -24,70 +24,49 @@ BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc
 
 SH=		${LOCALBASE}/bin/bash
 
-OPTIONS_DEFINE=	PERL PYTHON LUA
+OPTIONS_DEFINE=	PERL PYTHON LUA DOCS
 OPTIONS_DEFAULT=	PYTHON LUA
 
-NO_STAGE=	yes
 DB_VERSION?=	47
 USE_BDB=	${DB_VERSION}
 USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	configure db3/configure db/dist/configure \
 		file/configure xar/configure
 CONFIGURE_ARGS=	--without-js
-USES=		gmake perl5
+USES=		gmake perl5 shebangfix
+SHEBANG_FILES=	scripts/*
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 CONFLICTS=	rpm-3.* rpm-4.* rpm4-*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLUA}
-CONFIGURE_ARGS+=--with-lua=external \
-		--with-syck=external
-USE_LUA=	5.1-
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsyck.a:${PORTSDIR}/textproc/syck
-CPPFLAGS+=	-I${LUA_INCDIR}
-LDFLAGS+=	-L${LUA_LIBDIR}
-.else
-CONFIGURE_ARGS+=--without-lua \
-		--without-syck
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=--with-perl
-CONFIGURE_ENV+=	__PERL=${PERL}
-USE_PERL5+=	run
-PLIST_SUB+=	PERL=""
-.else
-CONFIGURE_ARGS+=--without-perl
-PLIST_SUB+=	PERL="@comment "
-.endif
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=--with-python=${PYTHON_VER}
-CONFIGURE_ENV+=	__PYTHON=${PYTHON_CMD}
-USE_PYTHON=	yes
-PLIST_SUB+=	PYTHON=""
-CPPFLAGS+=	-I${PYTHON_INCLUDEDIR}
-LDFLAGS+=	-L${PYTHON_LIBDIR}
-.else
-CONFIGURE_ARGS+=--without-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=--enable-nls
-USES+=		gettext iconv
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		dot:${PORTSDIR}/graphics/graphviz \
-		${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
-CONFIGURE_ARGS+=--with-apidocs
-.endif
+LUA_USE=	LUA=5.1-
+LUA_BUILD_DEPENDS=	${LOCALBASE}/lib/libsyck.a:${PORTSDIR}/textproc/syck
+LUA_CPPFLAGS=	-I${LUA_INCDIR}
+LUA_LDFLAGS=	-L${LUA_LIBDIR}
+LUA_CONFIGURE_ON=	--with-lua=external --with-syck=external
+LUA_CONFIGURE_OFF=	--without-lua --without-syck
+
+PERL_CONFIGURE_WITH=	perl
+PERL_USE=	PERL5=run
+PERL_CONFIGURE_ENV=	__PERL=${PERL}
+
+PYTHON_USE=	PYTHON=yes
+PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_VER}
+PYTHON_CONFIGURE_OFF=	--without-python
+PYTHON_CONFIGURE_ENV=	__PYTHON=${PYTHON_CMD}
+PYTHON_CPPFLAGS=	-I${PYTHON_INCLUDEDIR}
+PYTHON_LDFLAGS=		-L${PYTHON_LIBDIR}
+
+NLS_USES=	gettext iconv
+NLS_CONFIGURE_ENABLE=	nls
+
+DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
+			dot:${PORTSDIR}/graphics/graphviz \
+			${LOCALBASE}/lib/X11/fonts/freefont-ttf/FreeSans.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
+DOCS_CONFIGURE_WITH=	apidocs
+PORTDOCS=	*
 
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/xar
 LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
@@ -105,29 +84,9 @@ CONFIGURE_ARGS+=--with-db=external --wit
 		--with-path-cfg=${PREFIX}/etc/rpm \
 		--with-path-magic=${LOCALBASE}/share/file/magic
 
-MAN1=	gendiff.1 rpmgrep.1
-MAN8=	rpm.8 rpm2cpio.8 rpmbuild.8 rpmconstant.8 \
-	rpmcache.8 rpmdeps.8 rpmmtree.8
-.if defined(WITH_PERL)
-MAN3=	RPM.3 RPM::Constant.3 RPM::Dependencies.3 \
-	RPM::Files.3 RPM::Header.3 RPM::PackageIterator.3 \
-	RPM::Problems.3 RPM::Spec.3 RPM::Transaction.3
 MAN3PREFIX?=	${PREFIX}/lib/perl5/${PERL_VER}
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	liblzma.so:${PORTSDIR}/archivers/xz
-.endif
-
-.if ${OSVERSION} <= 701000
-MANUAL_PACKAGE_BUILD=	hangs on pointyhat
-.endif
+.include <bsd.port.options.mk>
 
 post-patch::
 	@${REINPLACE_CMD} -E -e \
@@ -138,8 +97,7 @@ post-patch::
 
 post-configure:
 .if ${PORT_OPTIONS:MPERL}
-	@cd ${CONFIGURE_WRKSRC}/perl && \
-		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+	@${REINPLACE_CMD} -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${CONFIGURE_WRKSRC}/perl/Makefile
 .endif
 	@echo "DOT_FONTPATH = ${LOCALBASE}/lib/X11/fonts/freefont-ttf" >> ${WRKSRC}/Doxyfile
 
@@ -151,12 +109,8 @@ post-build:
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	# Install documentation
-	${MKDIR} ${DOCSDIR}/apidocs/html
-	cd ${WRKSRC}/apidocs/html && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} \
-			${DOCSDIR}/apidocs/html/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/apidocs/html
+	cd ${WRKSRC}/apidocs/html && ${COPYTREE_SHARE} . ${DOCSDIR}/apidocs/html/
 .endif
-	# Run package installation script
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/archivers/rpm5/pkg-plist
==============================================================================
--- head/archivers/rpm5/pkg-plist	Sat Jan  4 22:54:00 2014	(r338681)
+++ head/archivers/rpm5/pkg-plist	Sat Jan  4 23:09:36 2014	(r338682)
@@ -3,7 +3,6 @@ bin/rpm
 bin/rpm2cpio
 bin/rpmbuild
 bin/rpmconstant
-
 include/rpm/db.h
 include/rpm/mire.h
 include/rpm/pkgio.h
@@ -35,7 +34,6 @@ include/rpm/rpmtypes.h
 include/rpm/rpmversion.h
 include/rpm/rpmzlog.h
 include/rpm/yarn.h
-
 lib/librpm-5.2.so
 lib/librpm.a
 lib/librpm.la
@@ -135,9 +133,7 @@ lib/rpm/u_pkg.sh
 lib/rpm/vcheck
 lib/rpm/vpkg-provides.sh
 lib/rpm/vpkg-provides2.sh
-
 libdata/pkgconfig/rpm.pc
-
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RPM.pm
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RPM/Constant.pm
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RPM/Dependencies.pm
@@ -150,11 +146,19 @@ libdata/pkgconfig/rpm.pc
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPM/.packlist
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPM/RPM.bs
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPM/RPM.so
+%%PERL%%%%PERL5_MAN3%%/RPM.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Constant.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Dependencies.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Files.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Header.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::PackageIterator.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Problems.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Spec.3.gz
+%%PERL%%%%PERL5_MAN3%%/RPM::Transaction.3.gz
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpmmodule.so
-
 share/locale/cs/LC_MESSAGES/rpm.mo
 share/locale/da/LC_MESSAGES/rpm.mo
 share/locale/de/LC_MESSAGES/rpm.mo
@@ -181,26 +185,33 @@ share/locale/tr/LC_MESSAGES/rpm.mo
 share/locale/uk/LC_MESSAGES/rpm.mo
 share/locale/vi/LC_MESSAGES/rpm.mo
 share/locale/zh_TW/LC_MESSAGES/rpm.mo
-
-man/fr/man8/rpm.8
-man/ja/man8/rpm.8
-man/ja/man8/rpm2cpio.8
-man/ja/man8/rpmbuild.8
-man/ja/man8/rpmcache.8
-man/ja/man8/rpmgraph.8
-man/ko/man8/rpm.8
-man/ko/man8/rpm2cpio.8
-man/pl/man1/gendiff.1
-man/pl/man8/rpm.8
-man/pl/man8/rpm2cpio.8
-man/pl/man8/rpmbuild.8
-man/pl/man8/rpmcache.8
-man/pl/man8/rpmdeps.8
-man/pl/man8/rpmgraph.8
-man/ru/man8/rpm.8
-man/ru/man8/rpm2cpio.8
-man/sk/man8/rpm.8
-
+man/fr/man8/rpm.8.gz
+man/ja/man8/rpm.8.gz
+man/ja/man8/rpm2cpio.8.gz
+man/ja/man8/rpmbuild.8.gz
+man/ja/man8/rpmcache.8.gz
+man/ja/man8/rpmgraph.8.gz
+man/ko/man8/rpm.8.gz
+man/ko/man8/rpm2cpio.8.gz
+man/man1/gendiff.1.gz
+man/man1/rpmgrep.1.gz
+man/man8/rpm.8.gz
+man/man8/rpm2cpio.8.gz
+man/man8/rpmbuild.8.gz
+man/man8/rpmcache.8.gz
+man/man8/rpmconstant.8.gz
+man/man8/rpmdeps.8.gz
+man/man8/rpmmtree.8.gz
+man/pl/man1/gendiff.1.gz
+man/pl/man8/rpm.8.gz
+man/pl/man8/rpm2cpio.8.gz
+man/pl/man8/rpmbuild.8.gz
+man/pl/man8/rpmcache.8.gz
+man/pl/man8/rpmdeps.8.gz
+man/pl/man8/rpmgraph.8.gz
+man/ru/man8/rpm.8.gz
+man/ru/man8/rpm2cpio.8.gz
+man/sk/man8/rpm.8.gz
 @dirrmtry man/fr/man8
 @dirrmtry man/ko/man8
 @dirrmtry man/pl/man1
@@ -212,40 +223,12 @@ man/sk/man8/rpm.8
 @dirrmtry man/pl
 @dirrmtry man/ru
 @dirrmtry man/sk
-
 @dirrm lib/rpm/bin
 @dirrm lib/rpm/helpers
 @dirrm lib/rpm/qf
 @dirrm lib/rpm
 %%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/RPM
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/rpm
- at dirrmtry lib/pkgconfig
 @dirrm include/rpm
- at dirrmtry src/rpm/SRPMS
- at dirrmtry src/rpm/SPECS
- at dirrmtry src/rpm/SOURCES
- at dirrmtry src/rpm/RPMS/x86_64
- at dirrmtry src/rpm/RPMS/sparcv9
- at dirrmtry src/rpm/RPMS/sparcv8
- at dirrmtry src/rpm/RPMS/sparc64
- at dirrmtry src/rpm/RPMS/sparc
- at dirrmtry src/rpm/RPMS/ppc64
- at dirrmtry src/rpm/RPMS/ppc
- at dirrmtry src/rpm/RPMS/pentium4
- at dirrmtry src/rpm/RPMS/pentium3
- at dirrmtry src/rpm/RPMS/noarch
- at dirrmtry src/rpm/RPMS/ia64
- at dirrmtry src/rpm/RPMS/i686
- at dirrmtry src/rpm/RPMS/i586
- at dirrmtry src/rpm/RPMS/i486
- at dirrmtry src/rpm/RPMS/i386
- at dirrmtry src/rpm/RPMS/athlon
- at dirrmtry src/rpm/RPMS/amd64
- at dirrmtry src/rpm/RPMS/alphaev6
- at dirrmtry src/rpm/RPMS/alpha
- at dirrmtry src/rpm/RPMS
- at dirrmtry src/rpm/BUILD
- at dirrmtry src/rpm
- at dirrmtry src
 @dirrmtry var/spool/repackage
 @dirrmtry var/local/lib/rpm

More information about the svn-ports-all mailing list