From owner-svn-ports-all@FreeBSD.ORG Sun May 11 16:47:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70658F4D; Sun, 11 May 2014 16:47: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51A5821A5; Sun, 11 May 2014 16:47:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BGlxFq070849; Sun, 11 May 2014 16:47:59 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BGlwin070845; Sun, 11 May 2014 16:47:58 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405111647.s4BGlwin070845@svn.freebsd.org> From: Dmitry Marakasov Date: Sun, 11 May 2014 16:47:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353718 - head/sysutils/pacman 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.18 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: Sun, 11 May 2014 16:47:59 -0000 Author: amdmi3 Date: Sun May 11 16:47:58 2014 New Revision: 353718 URL: http://svnweb.freebsd.org/changeset/ports/353718 QAT: https://qat.redports.org/buildarchive/r353718/ Log: - Support staging - Use new LIB_DEPENDS syntax - Convert USE_GMAKE to USES - Add missing bash dependency Added: head/sysutils/pacman/pkg-install (contents, props changed) Modified: head/sysutils/pacman/Makefile head/sysutils/pacman/pkg-deinstall head/sysutils/pacman/pkg-plist Modified: head/sysutils/pacman/Makefile ============================================================================== --- head/sysutils/pacman/Makefile Sun May 11 16:21:37 2014 (r353717) +++ head/sysutils/pacman/Makefile Sun May 11 16:47:58 2014 (r353718) @@ -3,7 +3,7 @@ PORTNAME= pacman PORTVERSION= 4.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.archlinux.org/other/pacman/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,10 +15,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ - gm4:${PORTSDIR}/devel/m4 + gm4:${PORTSDIR}/devel/m4 \ + bash:${PORTSDIR}/shells/bash +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +USES= gmake libtool GNU_CONFIGURE= yes -USE_GMAKE= yes CONFIGURE_ARGS= --with-root-dir="${PACMAN_ROOT}" \ --localstatedir=/var USE_LDCONFIG= yes @@ -34,29 +36,23 @@ PACMAN_ROOT?= "${PREFIX}/pacman" PORTEXAMPLES= * -MAN3= libalpm.3 -MAN5= PKGBUILD.5 makepkg.conf.5 pacman.conf.5 -MAN8= makepkg.8 pacman-key.8 pacman.8 pkgdelta.8 repo-add.8 vercmp.8 -MLINKS= repo-add.8 repo-remove.8 - OPTIONS_DEFINE= CURL GPGME EXAMPLES NLS OPTIONS_DEFAULT=CURL GPGME CURL_DESC= Use libcurl fetcher instead of external curl/wget GPGME_DESC= Use GPGME for PGP signature verification -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCURL} CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+=--without-libcurl .endif .if ${PORT_OPTIONS:MGPGME} CONFIGURE_ARGS+=--with-gpgme -LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme +LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme CFLAGS+= -I${LOCALBASE}/include/gpgme .endif @@ -83,17 +79,13 @@ post-patch: .endif post-install: + @${RM} -rf ${STAGEDIR}/var # handled by pkg-install .for f in makepkg.conf pacman.conf - ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}.dist - if [ ! -f ${PREFIX}/etc/${f} ]; then \ - ${INSTALL_DATA} ${PREFIX}/etc/${f}.dist ${PREFIX}/etc/${f}; \ - fi + ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${PREFIX}/etc/${f}.dist .endfor -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/PKGBUILD-example.txt ${EXAMPLESDIR}/ -.endif - ${MKDIR} ${PACMAN_ROOT} - ${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/PKGBUILD-example.txt ${STAGEDIR}${EXAMPLESDIR}/ + ${MKDIR} ${STAGEDIR}${PACMAN_ROOT} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libalpm.so .include Modified: head/sysutils/pacman/pkg-deinstall ============================================================================== --- head/sysutils/pacman/pkg-deinstall Sun May 11 16:21:37 2014 (r353717) +++ head/sysutils/pacman/pkg-deinstall Sun May 11 16:47:58 2014 (r353718) @@ -4,12 +4,18 @@ # case $2 in -DEINSTALL) - echo "" - echo "To completely remove the port, please remove the following" - echo "directories and the content manualy:" - echo "" - echo "/var/lib/pacman prefix/var/cache/pacman" - echo "" +POST-DEINSTALL) + rmdir /var/cache/pacman/pkg 2>/dev/null || true + rmdir /var/cache/pacman 2>/dev/null || true + rmdir /var/lib/pacman 2>/dev/null || true + rmdir /var/lib 2>/dev/null || true + if [ -e /var/lib/pacman -o -e /var/cache/pacman ]; then + echo "" + echo "To completely remove the port, please remove the following" + echo "directories and the content manualy:" + echo "" + echo " /var/lib/pacman /var/cache/pacman" + echo "" + fi ;; esac Added: head/sysutils/pacman/pkg-install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/pacman/pkg-install Sun May 11 16:47:58 2014 (r353718) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +case $2 in +POST-INSTALL) + mkdir -p /var/lib/pacman /var/cache/pacman/pkg + ;; +esac Modified: head/sysutils/pacman/pkg-plist ============================================================================== --- head/sysutils/pacman/pkg-plist Sun May 11 16:21:37 2014 (r353717) +++ head/sysutils/pacman/pkg-plist Sun May 11 16:47:58 2014 (r353718) @@ -23,9 +23,20 @@ etc/pacman.conf.dist include/alpm.h include/alpm_list.h lib/libalpm.a -lib/libalpm.la lib/libalpm.so lib/libalpm.so.7 +lib/libalpm.so.7.0.3 +man/man3/libalpm.3.gz +man/man5/PKGBUILD.5.gz +man/man5/makepkg.conf.5.gz +man/man5/pacman.conf.5.gz +man/man8/makepkg.8.gz +man/man8/pacman-key.8.gz +man/man8/pacman.8.gz +man/man8/pkgdelta.8.gz +man/man8/repo-add.8.gz +man/man8/repo-remove.8.gz +man/man8/vercmp.8.gz %%NLS%%share/locale/ca/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ca/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/ca/LC_MESSAGES/pacman.mo @@ -116,5 +127,4 @@ lib/libalpm.so.7 %%DATADIR%%/PKGBUILD.proto %%DATADIR%%/proto.install @dirrm %%DATADIR%% -@exec mkdir -p %%PACMAN_ROOT%% -@unexec rmdir %%PACMAN_ROOT%% 2>/dev/null || true +@dirrmtry %%PACMAN_ROOT%%