svn commit: r373595 - head/sysutils/pacman

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Nov 29 01:48:19 2014
New Revision: 373595
URL: https://svnweb.freebsd.org/changeset/ports/373595
QAT: https://qat.redports.org/buildarchive/r373595/

Log:
  - Clarify LICENSE
  - Switch configs to @sample
  - List empty dir in plist

Modified:
  head/sysutils/pacman/Makefile
  head/sysutils/pacman/pkg-deinstall
  head/sysutils/pacman/pkg-plist

Modified: head/sysutils/pacman/Makefile
==============================================================================
--- head/sysutils/pacman/Makefile	Sat Nov 29 01:46:17 2014	(r373594)
+++ head/sysutils/pacman/Makefile	Sat Nov 29 01:48:19 2014	(r373595)
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.archlinux.org/ot
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Package manager from ArchLinux
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
@@ -30,7 +30,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PACMAN_ROOT="${PACMAN_ROOT}"
-PLIST_SUB=	PACMAN_ROOT="${PACMAN_ROOT}"
+PLIST_SUB=	PACMAN_ROOT="${PACMAN_ROOT:C/^${PREFIX}//}"
 
 PACMAN_ROOT?=	"${PREFIX}/pacman"
 
@@ -80,7 +80,7 @@ post-patch:
 
 post-install:
 .for f in makepkg.conf pacman.conf
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${PREFIX}/etc/${f}.dist
+	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/PKGBUILD-example.txt ${STAGEDIR}${EXAMPLESDIR}/

Modified: head/sysutils/pacman/pkg-deinstall
==============================================================================
--- head/sysutils/pacman/pkg-deinstall	Sat Nov 29 01:46:17 2014	(r373594)
+++ head/sysutils/pacman/pkg-deinstall	Sat Nov 29 01:48:19 2014	(r373595)
@@ -5,11 +5,12 @@
 
 case $2 in
 POST-DEINSTALL)
-	if find /var/lib/pacman /var/cache/pacman -type f 2>/dev/null | grep -q ''; then
+	if find /var/lib/pacman /var/cache/pacman ${PREFIX}/pacman -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 "    /var/cache/pacman"
 		echo "    /var/lib/pacman"
 		echo ""

Modified: head/sysutils/pacman/pkg-plist
==============================================================================
--- head/sysutils/pacman/pkg-plist	Sat Nov 29 01:46:17 2014	(r373594)
+++ head/sysutils/pacman/pkg-plist	Sat Nov 29 01:48:19 2014	(r373595)
@@ -14,12 +14,8 @@ bin/repo-remove
 bin/testdb
 bin/testpkg
 bin/vercmp
- at unexec if cmp -s %D/etc/makepkg.conf.dist %D/etc/makepkg.conf; then rm -f %D/etc/makepkg.conf; fi
-etc/makepkg.conf.dist
- at exec if [ ! -f %B/makepkg.conf ]; then cp -p %D/%F %B/makepkg.conf; fi
- at unexec if cmp -s %D/etc/pacman.conf.dist %D/etc/pacman.conf; then rm -f %D/etc/pacman.conf; fi
-etc/pacman.conf.dist
- at exec if [ ! -f %B/pacman.conf ]; then cp -p %D/%F %B/pacman.conf; fi
+ at sample etc/makepkg.conf.sample
+ at sample etc/pacman.conf.sample
 include/alpm.h
 include/alpm_list.h
 lib/libalpm.a
@@ -122,6 +118,7 @@ man/man8/vercmp.8.gz
 %%DATADIR%%/PKGBUILD-split.proto
 %%DATADIR%%/PKGBUILD.proto
 %%DATADIR%%/proto.install
+ at dir %%PACMAN_ROOT%%
 @dir /var/cache/pacman/pkg
 @dir /var/cache/pacman
 @dir /var/lib/pacman