diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-11-29 01:48:19 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-11-29 01:48:19 +0000 |
| commit | 0462b32219530e8698d1f0c19d4e1d6b78922860 (patch) | |
| tree | b9ba9fec9cc293d7afad28e88e14bc36d90574cc | |
| parent | a5f4d60f4450499dccdd2bcc937f31e1b01d0615 (diff) | |
| download | ports-0462b32219530e8698d1f0c19d4e1d6b78922860.tar.gz ports-0462b32219530e8698d1f0c19d4e1d6b78922860.zip | |
Notes
| -rw-r--r-- | sysutils/pacman/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/pacman/pkg-deinstall | 3 | ||||
| -rw-r--r-- | sysutils/pacman/pkg-plist | 9 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile index 942990806dbf..127585b7dba4 100644 --- a/sysutils/pacman/Makefile +++ b/sysutils/pacman/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.archlinux.org/other/pacman/ \ MAINTAINER= amdmi3@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}/ diff --git a/sysutils/pacman/pkg-deinstall b/sysutils/pacman/pkg-deinstall index 130ef3a9ccb7..5994688d1a85 100644 --- a/sysutils/pacman/pkg-deinstall +++ b/sysutils/pacman/pkg-deinstall @@ -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 "" diff --git a/sysutils/pacman/pkg-plist b/sysutils/pacman/pkg-plist index b1af43520237..59bf8a0fa455 100644 --- a/sysutils/pacman/pkg-plist +++ b/sysutils/pacman/pkg-plist @@ -14,12 +14,8 @@ bin/repo-remove bin/testdb bin/testpkg bin/vercmp -@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 -@exec if [ ! -f %B/makepkg.conf ]; then cp -p %D/%F %B/makepkg.conf; fi -@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 -@exec if [ ! -f %B/pacman.conf ]; then cp -p %D/%F %B/pacman.conf; fi +@sample etc/makepkg.conf.sample +@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 +@dir %%PACMAN_ROOT%% @dir /var/cache/pacman/pkg @dir /var/cache/pacman @dir /var/lib/pacman |