svn commit: r410139 - in head/archivers/dpkg: . files

[Pawel Pekala]

Author: pawel
Date: Fri Mar  4 17:04:51 2016
New Revision: 410139
URL: https://svnweb.freebsd.org/changeset/ports/410139

Log:
  Mistkenly some positions in pkg-plist were created as directories
  instead of empty files. Fix this and use @sample keyword for they
  removal management in place of install/deinstall scripts.
  
  PR:		207527
  Reported by:	amdmi3

Deleted:
  head/archivers/dpkg/files/pkg-deinstall.in
  head/archivers/dpkg/files/pkg-install.in
Modified:
  head/archivers/dpkg/Makefile
  head/archivers/dpkg/pkg-plist

Modified: head/archivers/dpkg/Makefile
==============================================================================
--- head/archivers/dpkg/Makefile	Fri Mar  4 17:04:06 2016	(r410138)
+++ head/archivers/dpkg/Makefile	Fri Mar  4 17:04:51 2016	(r410139)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dpkg
 PORTVERSION=	1.18.4
+PORTREVISION=	1
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	dpkg_${PORTVERSION}
@@ -24,9 +25,6 @@ WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}
 DPKGDIR?=	/var/db/dpkg
 PLIST_SUB+=	DPKGDIR=${DPKGDIR}
 
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST+=	DPKGDIR=${DPKGDIR}
-
 CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-logdir=/var/log
@@ -39,7 +37,7 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-install:
-	(cd ${STAGEDIR}${DPKGDIR} && ${MKDIR} available diversions \
-		statoverride status)
+	(cd ${STAGEDIR}${DPKGDIR} && ${TOUCH} available.sample \
+		diversions.sample statoverride.sample status.sample)
 
 .include <bsd.port.mk>

Modified: head/archivers/dpkg/pkg-plist
==============================================================================
--- head/archivers/dpkg/pkg-plist	Fri Mar  4 17:04:06 2016	(r410138)
+++ head/archivers/dpkg/pkg-plist	Fri Mar  4 17:04:51 2016	(r410139)
@@ -541,13 +541,15 @@ sbin/start-stop-daemon
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/dselect.mo
+ at sample %%DPKGDIR%%/available.sample
+ at sample %%DPKGDIR%%/diversions.sample
+ at sample %%DPKGDIR%%/statoverride.sample
+ at sample %%DPKGDIR%%/status.sample
 %%NLS%%@dir man/hu/man8
 %%NLS%%@dir man/hu/man1
 @dir etc/dpkg/dselect.cfg.d
 @dir etc/dpkg/dpkg.cfg.d
 @dir %%DPKGDIR%%/updates
- at dir %%DPKGDIR%%/status
- at dir %%DPKGDIR%%/statoverride
 @dir %%DPKGDIR%%/parts
 @dir %%DPKGDIR%%/methods/multicd
 @dir %%DPKGDIR%%/methods/mnt
@@ -556,7 +558,5 @@ sbin/start-stop-daemon
 @dir %%DPKGDIR%%/methods/disk
 @dir %%DPKGDIR%%/methods
 @dir %%DPKGDIR%%/info
- at dir %%DPKGDIR%%/diversions
- at dir %%DPKGDIR%%/available
 @dir %%DPKGDIR%%/alternatives
 @dir %%DPKGDIR%%