From owner-svn-ports-head@FreeBSD.ORG Tue Apr 2 22:14:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7F6F12E0; Tue, 2 Apr 2013 22:14:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 71D78E79; Tue, 2 Apr 2013 22:14:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r32MEcd0071087; Tue, 2 Apr 2013 22:14:38 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r32MEcj8071083; Tue, 2 Apr 2013 22:14:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201304022214.r32MEcj8071083@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 2 Apr 2013 22:14:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315688 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 22:14:38 -0000 Author: bapt Date: Tue Apr 2 22:14:37 2013 New Revision: 315688 URL: http://svnweb.freebsd.org/changeset/ports/315688 Log: Do not try to remove directories not created by during the ports installation, Only create them from package depending on the architecture While here trim header, and convert WITHOUT_NLS to PORT_OPTIONS NLS Tested by: rene Approved by: portmgr (implicit) With hat: portmgr Modified: head/archivers/rpm/Makefile head/archivers/rpm/pkg-plist Modified: head/archivers/rpm/Makefile ============================================================================== --- head/archivers/rpm/Makefile Tue Apr 2 20:21:28 2013 (r315687) +++ head/archivers/rpm/Makefile Tue Apr 2 22:14:37 2013 (r315688) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rpm -# Date created: 30 April 1999 -# Whom: Thomas Gellekum -# +# Created by: Thomas Gellekum # $FreeBSD$ -# PORTNAME= rpm PORTVERSION= 3.0.6 @@ -27,19 +23,40 @@ CONFIGURE_ARGS= --with-glob USE_LDCONFIG= yes MAKE_ENV= OLD_PO_FILE_INPUT=1 -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -liconv" +.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} + post-patch: .for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} Modified: head/archivers/rpm/pkg-plist ============================================================================== --- head/archivers/rpm/pkg-plist Tue Apr 2 20:21:28 2013 (r315687) +++ head/archivers/rpm/pkg-plist Tue Apr 2 22:14:37 2013 (r315688) @@ -74,19 +74,19 @@ lib/rpmrc @dirrmtry src/redhat/SRPMS @dirrmtry src/redhat/SPECS @dirrmtry src/redhat/SOURCES -@dirrmtry src/redhat/RPMS/amd64 -@dirrmtry src/redhat/RPMS/athlon -@dirrmtry src/redhat/RPMS/i386 -@dirrmtry src/redhat/RPMS/i486 -@dirrmtry src/redhat/RPMS/i586 -@dirrmtry src/redhat/RPMS/i686 -@dirrmtry src/redhat/RPMS/ia64 +%%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 -@dirrmtry src/redhat/RPMS/powerpc -@dirrmtry src/redhat/RPMS/ppc -@dirrmtry src/redhat/RPMS/sparc -@dirrmtry src/redhat/RPMS/sparcv9 -@dirrmtry src/redhat/RPMS/sparc64 +%%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 @@ -99,19 +99,19 @@ lib/rpmrc @exec mkdir -p %D/src/redhat @exec mkdir -p %D/src/redhat/BUILD @exec mkdir -p %D/src/redhat/RPMS -@exec mkdir -p %D/src/redhat/RPMS/amd64 -@exec mkdir -p %D/src/redhat/RPMS/athlon -@exec mkdir -p %D/src/redhat/RPMS/i386 -@exec mkdir -p %D/src/redhat/RPMS/i486 -@exec mkdir -p %D/src/redhat/RPMS/i586 -@exec mkdir -p %D/src/redhat/RPMS/i686 -@exec mkdir -p %D/src/redhat/RPMS/ia64 +%%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 -@exec mkdir -p %D/src/redhat/RPMS/powerpc -@exec mkdir -p %D/src/redhat/RPMS/ppc -@exec mkdir -p %D/src/redhat/RPMS/sparc -@exec mkdir -p %D/src/redhat/RPMS/sparcv9 -@exec mkdir -p %D/src/redhat/RPMS/sparc64 +%%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