From owner-svn-ports-all@FreeBSD.ORG Sun Jan 25 02:55:50 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67764D17; Sun, 25 Jan 2015 02:55:50 +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 48C8C632; Sun, 25 Jan 2015 02:55:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0P2tow8066571; Sun, 25 Jan 2015 02:55:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0P2tnii066567; Sun, 25 Jan 2015 02:55:49 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201501250255.t0P2tnii066567@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 25 Jan 2015 02:55:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377858 - in head/sysutils/pacman: . files 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-1 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, 25 Jan 2015 02:55:50 -0000 Author: amdmi3 Date: Sun Jan 25 02:55:48 2015 New Revision: 377858 URL: https://svnweb.freebsd.org/changeset/ports/377858 QAT: https://qat.redports.org/buildarchive/r377858/ Log: - Update to 4.2.0 - Fix pkg-deinstall Added: head/sysutils/pacman/files/pkg-deinstall.in - copied, changed from r377718, head/sysutils/pacman/pkg-deinstall Deleted: head/sysutils/pacman/pkg-deinstall Modified: head/sysutils/pacman/Makefile head/sysutils/pacman/distinfo head/sysutils/pacman/pkg-plist Modified: head/sysutils/pacman/Makefile ============================================================================== --- head/sysutils/pacman/Makefile Sun Jan 25 02:26:16 2015 (r377857) +++ head/sysutils/pacman/Makefile Sun Jan 25 02:55:48 2015 (r377858) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pacman -PORTVERSION= 4.0.3 -PORTREVISION= 4 +PORTVERSION= 4.2.0 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.archlinux.org/other/pacman/ \ http://mirror.amdmi3.ru/distfiles/ @@ -18,8 +17,10 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/text gm4:${PORTSDIR}/devel/m4 \ bash:${PORTSDIR}/shells/bash RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +LIB_DEPENDS= libarchive.so.13:${PORTSDIR}/archivers/libarchive -USES= gmake libtool +USES= gmake libtool perl5 pkgconfig shebangfix +SHEBANG_FILES= ${WRKSRC}/scripts/makepkg-template.pl.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-root-dir="${PACMAN_ROOT}" \ --localstatedir=/var @@ -28,8 +29,8 @@ USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -SUB_FILES= pkg-message -SUB_LIST= PACMAN_ROOT="${PACMAN_ROOT}" +SUB_FILES= pkg-message pkg-deinstall +SUB_LIST= PACMAN_ROOT="${PACMAN_ROOT}" PREFIX="${PREFIX}" PLIST_SUB= PACMAN_ROOT="${PACMAN_ROOT:C/^${PREFIX}//}" PACMAN_ROOT?= "${PREFIX}/pacman" @@ -66,6 +67,7 @@ PLIST_SUB+= NLS="@comment " post-patch: @${REINPLACE_CMD} -e 's|m4|gm4|' ${WRKSRC}/scripts/Makefile.in + @${REINPLACE_CMD} -e '2 s/.*/exit 0/' ${WRKSRC}/build-aux/missing @${REINPLACE_CMD} -e '/INSTALL_DATA.*sysconfdir/ d' ${WRKSRC}/etc/Makefile.in .for tool in curl wget rsync lftpget @${REINPLACE_CMD} -e 's|/usr/bin/${tool}|${LOCALBASE}/bin/${tool}|' \ Modified: head/sysutils/pacman/distinfo ============================================================================== --- head/sysutils/pacman/distinfo Sun Jan 25 02:26:16 2015 (r377857) +++ head/sysutils/pacman/distinfo Sun Jan 25 02:55:48 2015 (r377858) @@ -1,2 +1,2 @@ -SHA256 (pacman-4.0.3.tar.gz) = a48696ae51aaccf31a69ea7916ba9b06e7836eb933b8a281c666729c9d55ce25 -SIZE (pacman-4.0.3.tar.gz) = 1961839 +SHA256 (pacman-4.2.0.tar.gz) = 941aca897db3218f0cb4036de13422d74212afbcdbf4a7cd7074a7128e196a22 +SIZE (pacman-4.2.0.tar.gz) = 2934713 Copied and modified: head/sysutils/pacman/files/pkg-deinstall.in (from r377718, head/sysutils/pacman/pkg-deinstall) ============================================================================== --- head/sysutils/pacman/pkg-deinstall Fri Jan 23 09:35:06 2015 (r377718, copy source) +++ head/sysutils/pacman/files/pkg-deinstall.in Sun Jan 25 02:55:48 2015 (r377858) @@ -5,12 +5,12 @@ case $2 in POST-DEINSTALL) - if find /var/lib/pacman /var/cache/pacman ${PREFIX}/pacman -type f 2>/dev/null | head -1 | grep -q ''; then + if find /var/lib/pacman /var/cache/pacman %%PACMAN_ROOT%% -type f 2>/dev/null | head -1 | grep -q ''; then echo "" echo "To completely remove the port, please remove the following" echo "directories and the content manualy if its no longer needed:" echo "" - echo " ${PREFIX}/pacman" + echo " %%PACMAN_ROOT%%" echo " /var/cache/pacman" echo " /var/lib/pacman" echo "" Modified: head/sysutils/pacman/pkg-plist ============================================================================== --- head/sysutils/pacman/pkg-plist Sun Jan 25 02:26:16 2015 (r377857) +++ head/sysutils/pacman/pkg-plist Sun Jan 25 02:55:48 2015 (r377858) @@ -1,5 +1,6 @@ bin/cleanupdelta bin/makepkg +bin/makepkg-template bin/pacman bin/pacman-db-upgrade bin/pacman-key @@ -7,7 +8,6 @@ bin/pacman-optimize bin/pacsort bin/pactree bin/pkgdelta -bin/rankmirrors bin/repo-add bin/repo-elephant bin/repo-remove @@ -20,8 +20,10 @@ include/alpm.h include/alpm_list.h lib/libalpm.a lib/libalpm.so -lib/libalpm.so.7 -lib/libalpm.so.7.0.3 +lib/libalpm.so.9 +lib/libalpm.so.9.0.0 +lib/pkgconfig/libalpm.pc +man/man1/makepkg-template.1.gz man/man3/libalpm.3.gz man/man5/PKGBUILD.5.gz man/man5/makepkg.conf.5.gz @@ -29,10 +31,14 @@ man/man5/pacman.conf.5.gz man/man8/makepkg.8.gz man/man8/pacman-key.8.gz man/man8/pacman.8.gz +man/man8/pactree.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/ar/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/ar/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/ar/LC_MESSAGES/pacman.mo %%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 @@ -51,30 +57,53 @@ man/man8/vercmp.8.gz %%NLS%%share/locale/en_GB/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/eo/LC_MESSAGES/pacman.mo %%NLS%%share/locale/es/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/es/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/es/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/fa/LC_MESSAGES/pacman.mo %%NLS%%share/locale/fi/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/fi/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/fi/LC_MESSAGES/pacman.mo %%NLS%%share/locale/fr/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/fr/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/fr/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/gl/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/gl/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/gl/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/hr/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/hr/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/hr/LC_MESSAGES/pacman.mo %%NLS%%share/locale/hu/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/hu/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/hu/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/id/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/id/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/id/LC_MESSAGES/pacman.mo %%NLS%%share/locale/it/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/it/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/it/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/ja/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/ja/LC_MESSAGES/pacman.mo %%NLS%%share/locale/kk/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/kk/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/kk/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/ko/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/ko/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/ko_KR/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/ko_KR/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/ko_KR/LC_MESSAGES/pacman.mo %%NLS%%share/locale/lt/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/lt/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/lt/LC_MESSAGES/pacman.mo %%NLS%%share/locale/nb/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/nb/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/nb/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/nl/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/nl/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/nl/LC_MESSAGES/pacman.mo %%NLS%%share/locale/pl/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/pl/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/pl/LC_MESSAGES/pacman.mo @@ -93,6 +122,9 @@ man/man8/vercmp.8.gz %%NLS%%share/locale/sk/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sk/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/sk/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/sl/LC_MESSAGES/libalpm.mo +%%NLS%%share/locale/sl/LC_MESSAGES/pacman-scripts.mo +%%NLS%%share/locale/sl/LC_MESSAGES/pacman.mo %%NLS%%share/locale/sr/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sr/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/sr/LC_MESSAGES/pacman.mo @@ -108,14 +140,15 @@ man/man8/vercmp.8.gz %%NLS%%share/locale/uk/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/uk/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/uk/LC_MESSAGES/pacman.mo +%%NLS%%share/locale/vi/LC_MESSAGES/pacman.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pacman.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pacman.mo -%%DATADIR%%/ChangeLog.proto %%DATADIR%%/PKGBUILD-split.proto +%%DATADIR%%/PKGBUILD-vcs.proto %%DATADIR%%/PKGBUILD.proto %%DATADIR%%/proto.install @dir %%PACMAN_ROOT%%