Fix package (missing empty directory) by introducing a static plist.

PR:		88752
Submitted by:	Boris Samorodov <bsam@ipt.ru>

6 files changed, 60 insertions, 24 deletions

diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index a1ec3455267c..34827e019c38 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts linux
 MASTER_SITES=	ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/
 
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 USE_REINPLACE=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.2.3-5.i386.rpm
 
 #PKGINSTALL=	${WRKDIR}/pkg-install
@@ -36,12 +35,6 @@ post-patch:
 		s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
 		${WRKSRC}/tmp/etc/fonts/fonts.conf
 
-pre-install:
-	@cd ${WRKSRC}/tmp; \
-		${FIND} * -type f -o -type l > ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} font | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}
-
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
 	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
diff --git a/x11-fonts/linux-f10-fontconfig/pkg-plist b/x11-fonts/linux-f10-fontconfig/pkg-plist
new file mode 100644
index 000000000000..67d36104fb9a
--- /dev/null
+++ b/x11-fonts/linux-f10-fontconfig/pkg-plist
@@ -0,0 +1,19 @@
+etc/fonts/fonts.conf
+etc/fonts/fonts.dtd
+etc/fonts/local.conf
+usr/bin/fc-cache
+usr/bin/fc-list
+usr/lib/libfontconfig.so.1
+usr/lib/libfontconfig.so.1.0.4
+usr/share/doc/fontconfig-2.2.3/AUTHORS
+usr/share/doc/fontconfig-2.2.3/COPYING
+usr/share/doc/fontconfig-2.2.3/README
+usr/share/doc/fontconfig-2.2.3/fontconfig-user.html
+usr/share/doc/fontconfig-2.2.3/fontconfig-user.txt
+usr/share/man/man1/fc-cache.1.gz
+usr/share/man/man1/fc-list.1.gz
+usr/share/man/man5/fonts-conf.5.gz
+@dirrm etc/fonts
+@dirrm usr/share/doc/fontconfig-2.2.3
+@exec /bin/mkdir -p %D/usr/share/fonts
+@dirrm usr/share/fonts
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index a1ec3455267c..34827e019c38 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts linux
 MASTER_SITES=	ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/
 
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 USE_REINPLACE=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.2.3-5.i386.rpm
 
 #PKGINSTALL=	${WRKDIR}/pkg-install
@@ -36,12 +35,6 @@ post-patch:
 		s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
 		${WRKSRC}/tmp/etc/fonts/fonts.conf
 
-pre-install:
-	@cd ${WRKSRC}/tmp; \
-		${FIND} * -type f -o -type l > ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} font | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}
-
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
 	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
diff --git a/x11-fonts/linux-f8-fontconfig/pkg-plist b/x11-fonts/linux-f8-fontconfig/pkg-plist
new file mode 100644
index 000000000000..67d36104fb9a
--- /dev/null
+++ b/x11-fonts/linux-f8-fontconfig/pkg-plist
@@ -0,0 +1,19 @@
+etc/fonts/fonts.conf
+etc/fonts/fonts.dtd
+etc/fonts/local.conf
+usr/bin/fc-cache
+usr/bin/fc-list
+usr/lib/libfontconfig.so.1
+usr/lib/libfontconfig.so.1.0.4
+usr/share/doc/fontconfig-2.2.3/AUTHORS
+usr/share/doc/fontconfig-2.2.3/COPYING
+usr/share/doc/fontconfig-2.2.3/README
+usr/share/doc/fontconfig-2.2.3/fontconfig-user.html
+usr/share/doc/fontconfig-2.2.3/fontconfig-user.txt
+usr/share/man/man1/fc-cache.1.gz
+usr/share/man/man1/fc-list.1.gz
+usr/share/man/man5/fonts-conf.5.gz
+@dirrm etc/fonts
+@dirrm usr/share/doc/fontconfig-2.2.3
+@exec /bin/mkdir -p %D/usr/share/fonts
+@dirrm usr/share/fonts
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index a1ec3455267c..34827e019c38 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts linux
 MASTER_SITES=	ftp://rpmfind.net/linux/fedora/core/3/x86_64/os/Fedora/RPMS/
 
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 USE_REINPLACE=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.2.3-5.i386.rpm
 
 #PKGINSTALL=	${WRKDIR}/pkg-install
@@ -36,12 +35,6 @@ post-patch:
 		s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
 		${WRKSRC}/tmp/etc/fonts/fonts.conf
 
-pre-install:
-	@cd ${WRKSRC}/tmp; \
-		${FIND} * -type f -o -type l > ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} font | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}
-
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
 	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
diff --git a/x11-fonts/linux-fontconfig/pkg-plist b/x11-fonts/linux-fontconfig/pkg-plist
new file mode 100644
index 000000000000..67d36104fb9a
--- /dev/null
+++ b/x11-fonts/linux-fontconfig/pkg-plist
@@ -0,0 +1,19 @@
+etc/fonts/fonts.conf
+etc/fonts/fonts.dtd
+etc/fonts/local.conf
+usr/bin/fc-cache
+usr/bin/fc-list
+usr/lib/libfontconfig.so.1
+usr/lib/libfontconfig.so.1.0.4
+usr/share/doc/fontconfig-2.2.3/AUTHORS
+usr/share/doc/fontconfig-2.2.3/COPYING
+usr/share/doc/fontconfig-2.2.3/README
+usr/share/doc/fontconfig-2.2.3/fontconfig-user.html
+usr/share/doc/fontconfig-2.2.3/fontconfig-user.txt
+usr/share/man/man1/fc-cache.1.gz
+usr/share/man/man1/fc-list.1.gz
+usr/share/man/man5/fonts-conf.5.gz
+@dirrm etc/fonts
+@dirrm usr/share/doc/fontconfig-2.2.3
+@exec /bin/mkdir -p %D/usr/share/fonts
+@dirrm usr/share/fonts