svn commit: r338667 - head/archivers/rpm
Baptiste Daroussin
bapt at FreeBSD.org
Sat Jan 4 18:39:59 UTC 2014
Author: bapt
Date: Sat Jan 4 18:39:58 2014
New Revision: 338667
URL: http://svnweb.freebsd.org/changeset/ports/338667
Log:
Support stage
Fix bad shebangs
Do not install anymore the ${PREFIX}/src directories
Use options helpers
Modified:
head/archivers/rpm/Makefile
head/archivers/rpm/pkg-plist
Modified: head/archivers/rpm/Makefile
==============================================================================
--- head/archivers/rpm/Makefile Sat Jan 4 18:31:34 2014 (r338666)
+++ head/archivers/rpm/Makefile Sat Jan 4 18:39:58 2014 (r338667)
@@ -3,7 +3,7 @@
PORTNAME= rpm
PORTVERSION= 3.0.6
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= archivers
MASTER_SITES= http://rpm5.org/files/rpm/rpm-3.0/ \
http://rpm.org/releases/historical/rpm-3.0.x/ \
@@ -14,48 +14,22 @@ COMMENT= The Red Hat Package Manager
LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt
+OPTIONS_DEFINE= NLS
+
CONFLICTS= rpm-[45].* rpm[45]-*
-NO_STAGE= yes
-USES= gmake
+USES= gmake shebangfix
+SHEBANG_FILES= scripts/*
USE_AUTOTOOLS= automake14 autoconf213 libtool
CONFIGURE_ARGS= --with-glob
USE_LDCONFIG= yes
MAKE_ENV= OLD_PO_FILE_INPUT=1
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}"
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
-
-MAN1= gendiff.1
-MAN8= rpm.8 rpm2cpio.8
-
-X86_SUB= "@comment "
-AMD64_SUB= "@comment "
-PPC_SUB= "@comment "
-SPARC_SUB= "@comment "
-IA64_SUB= "@comment "
-.if ${ARCH} == i386
-X86_SUB= ""
-.elif ${ARCH} == amd64
-AMD64_SUB= ""
-.elif ${ARCH} == sparc64
-SPARC_SUB= ""
-.elif ${ARCH} == powerpc || ${ARCH} == powerpc64
-PPC_SUB= ""
-.elif ${ARCH} == ia64
-IA64_SUB= ""
-.endif
-
-PLIST_SUB+= X86=${X86_SUB} PPC=${PPC_SUB} SPARC=${SPARC_SUB} IA64=${IA64_SUB} AMD64=${AMD64_SUB}
+OPTIONS_SUB= yes
+NLS_USES= gettext
+NLS_CPPFLAGS= -I${LOCALBASE}/include
+NLS_CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}"
+NLS_CONFIGURE_ENABLE= nls
post-patch:
.for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c
@@ -63,8 +37,8 @@ post-patch:
.endfor
post-install:
- ${INSTALL_MAN} ${WRKSRC}/doc/gendiff.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/rpm.8 ${PREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/doc/rpm2cpio.8 ${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/doc/gendiff.1 ${STAGEDIR}${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/rpm.8 ${STAGEDIR}${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKSRC}/doc/rpm2cpio.8 ${STAGEDIR}${PREFIX}/man/man8
.include <bsd.port.mk>
Modified: head/archivers/rpm/pkg-plist
==============================================================================
--- head/archivers/rpm/pkg-plist Sat Jan 4 18:31:34 2014 (r338666)
+++ head/archivers/rpm/pkg-plist Sat Jan 4 18:39:58 2014 (r338667)
@@ -56,6 +56,9 @@ lib/rpm/vpkg-provides.sh
lib/rpm/vpkg-provides2.sh
lib/rpmpopt
lib/rpmrc
+man/man1/gendiff.1.gz
+man/man8/rpm.8.gz
+man/man8/rpm2cpio.8.gz
%%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/de/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/fi/LC_MESSAGES/rpm.mo
@@ -71,47 +74,7 @@ lib/rpmrc
%%NLS%%share/locale/tr/LC_MESSAGES/rpm.mo
@dirrm lib/rpm
@dirrm include/rpm
- at dirrmtry src/redhat/SRPMS
- at dirrmtry src/redhat/SPECS
- at dirrmtry src/redhat/SOURCES
-%%AMD64%%@dirrmtry src/redhat/RPMS/amd64
-%%X86%%@dirrmtry src/redhat/RPMS/athlon
-%%X86%%@dirrmtry src/redhat/RPMS/i386
-%%X86%%@dirrmtry src/redhat/RPMS/i486
-%%X86%%@dirrmtry src/redhat/RPMS/i586
-%%X86%%@dirrmtry src/redhat/RPMS/i686
-%%IA64%%@dirrmtry src/redhat/RPMS/ia64
- at dirrmtry src/redhat/RPMS/noarch
-%%PPC%%@dirrmtry src/redhat/RPMS/powerpc
-%%PPC%%@dirrmtry src/redhat/RPMS/ppc
-%%SPARC%%@dirrmtry src/redhat/RPMS/sparc
-%%SPARC%%@dirrmtry src/redhat/RPMS/sparcv9
-%%SPARC%%@dirrmtry src/redhat/RPMS/sparc64
- at dirrmtry src/redhat/RPMS
- at dirrmtry src/redhat/BUILD
- at dirrmtry src/redhat
- at dirrmtry src
@unexec rmdir /var/lib/rpm 2>/dev/null || true
@unexec rmdir /var/lib 2>/dev/null || true
@exec mkdir -p /var/lib
@exec mkdir -p /var/lib/rpm
- at exec mkdir -p %D/src
- at exec mkdir -p %D/src/redhat
- at exec mkdir -p %D/src/redhat/BUILD
- at exec mkdir -p %D/src/redhat/RPMS
-%%AMD64%%@exec mkdir -p %D/src/redhat/RPMS/amd64
-%%X86%%@exec mkdir -p %D/src/redhat/RPMS/athlon
-%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i386
-%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i486
-%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i586
-%%X86%%@exec mkdir -p %D/src/redhat/RPMS/i686
-%%IA64%%@exec mkdir -p %D/src/redhat/RPMS/ia64
- at exec mkdir -p %D/src/redhat/RPMS/noarch
-%%PPC%%@exec mkdir -p %D/src/redhat/RPMS/powerpc
-%%PPC%%@exec mkdir -p %D/src/redhat/RPMS/ppc
-%%SPARC%%@exec mkdir -p %D/src/redhat/RPMS/sparc
-%%SPARC%%@exec mkdir -p %D/src/redhat/RPMS/sparcv9
-%%SPARC%%@exec mkdir -p %D/src/redhat/RPMS/sparc64
- at exec mkdir -p %D/src/redhat/SOURCES
- at exec mkdir -p %D/src/redhat/SPECS
- at exec mkdir -p %D/src/redhat/SRPMS
More information about the svn-ports-all
mailing list