From owner-svn-ports-all@FreeBSD.ORG Sat Jan 4 18:39:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58B1362D; Sat, 4 Jan 2014 18:39:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 38E0716D4; Sat, 4 Jan 2014 18:39:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IdxsM043875; Sat, 4 Jan 2014 18:39:59 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IdwQ0043871; Sat, 4 Jan 2014 18:39:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401041839.s04IdwQ0043871@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 4 Jan 2014 18:39:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338667 - head/archivers/rpm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:39:59 -0000 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 - -.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 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 -@dirrmtry src/redhat/SRPMS -@dirrmtry src/redhat/SPECS -@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 -@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 -@dirrmtry src/redhat/RPMS -@dirrmtry src/redhat/BUILD -@dirrmtry src/redhat -@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 -@exec mkdir -p %D/src -@exec mkdir -p %D/src/redhat -@exec mkdir -p %D/src/redhat/BUILD -@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 -@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 -@exec mkdir -p %D/src/redhat/SOURCES -@exec mkdir -p %D/src/redhat/SPECS -@exec mkdir -p %D/src/redhat/SRPMS