Convert @exec/@unexec to @pkgdir or drop it.

15 files changed, 42 insertions, 51 deletions

diff --git a/print/acroread/PLIST.common_end b/print/acroread/PLIST.common_end
index 6c4147d15f1..0894cc7169c 100644
--- a/print/acroread/PLIST.common_end
+++ b/print/acroread/PLIST.common_end
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST.common_end,v 1.3 2009/06/14 18:11:53 joerg Exp $
-@exec ${MKDIR} %D/lib/netscape/plugins
-@unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/netscape 2>/dev/null || ${TRUE}
+@comment $NetBSD: PLIST.common_end,v 1.4 2009/06/14 21:16:21 joerg Exp $
+@pkgdir lib/netscape/plugins
diff --git a/print/adobeps-win/PLIST b/print/adobeps-win/PLIST
index 04c0fa9c6cd..4b2b2957cae 100644
--- a/print/adobeps-win/PLIST
+++ b/print/adobeps-win/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/28 08:25:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:16:21 joerg Exp $
 share/cups/drivers/ADFONTS.MFM
 share/cups/drivers/ADOBEPS4.DRV
 share/cups/drivers/ADOBEPS4.HLP
@@ -8,4 +8,3 @@ share/cups/drivers/ADOBEPSU.HLP
 share/cups/drivers/DEFPRTR2.PPD
 share/cups/drivers/ICONLIB.DLL
 share/cups/drivers/PSMON.DLL
-@unexec ${RMDIR} -p %D/share/cups/drivers 2>/dev/null || ${TRUE}
diff --git a/print/apsfilter/PLIST b/print/apsfilter/PLIST
index 3d738f43ae1..01023f7c361 100644
--- a/print/apsfilter/PLIST
+++ b/print/apsfilter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:11:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 21:16:21 joerg Exp $
 bin/aps2file
 bin/apsfilter-bug
 bin/apspreview
@@ -324,4 +324,3 @@ share/doc/apsfilter/apsfilter4.png
 share/doc/apsfilter/handbook.html
 share/doc/apsfilter/paper
 @unexec ${RMDIR} %D/etc/apsfilter 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/apsfilter 2>/dev/null || ${TRUE}
diff --git a/print/cups/PLIST b/print/cups/PLIST
index a3e44fa281c..33a94e5c580 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2009/06/14 18:11:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.28 2009/06/14 21:16:21 joerg Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -1717,23 +1717,23 @@ share/locale/ru/cups_ru.po
 share/locale/sv/cups_sv.po
 share/locale/zh/cups_zh.po
 share/locale/zh_TW/cups_zh_TW.po
-@exec ${MKDIR} %D/share/doc/cups/zh/images
-@exec ${MKDIR} %D/share/doc/cups/ru/images
-@exec ${MKDIR} %D/share/doc/cups/pt_BR/images
-@exec ${MKDIR} %D/share/doc/cups/pt/images
-@exec ${MKDIR} %D/share/doc/cups/no/images
-@exec ${MKDIR} %D/share/doc/cups/nl/images
-@exec ${MKDIR} %D/share/doc/cups/ko/images
-@exec ${MKDIR} %D/share/doc/cups/fi/images
-@exec ${MKDIR} %D/share/doc/cups/da/images
-@exec ${MKDIR} %D/share/cups/templates/zh
-@exec ${MKDIR} %D/share/cups/templates/ru
-@exec ${MKDIR} %D/share/cups/templates/pt_BR
-@exec ${MKDIR} %D/share/cups/templates/pt
-@exec ${MKDIR} %D/share/cups/templates/no
-@exec ${MKDIR} %D/share/cups/templates/nl
-@exec ${MKDIR} %D/share/cups/templates/ko
-@exec ${MKDIR} %D/share/cups/templates/fi
-@exec ${MKDIR} %D/share/cups/templates/da
-@exec ${MKDIR} %D/share/cups/profiles
-@exec ${MKDIR} %D/libexec/cups/driver
+@pkgdir share/doc/cups/zh/images
+@pkgdir share/doc/cups/ru/images
+@pkgdir share/doc/cups/pt_BR/images
+@pkgdir share/doc/cups/pt/images
+@pkgdir share/doc/cups/no/images
+@pkgdir share/doc/cups/nl/images
+@pkgdir share/doc/cups/ko/images
+@pkgdir share/doc/cups/fi/images
+@pkgdir share/doc/cups/da/images
+@pkgdir share/cups/templates/zh
+@pkgdir share/cups/templates/ru
+@pkgdir share/cups/templates/pt_BR
+@pkgdir share/cups/templates/pt
+@pkgdir share/cups/templates/no
+@pkgdir share/cups/templates/nl
+@pkgdir share/cups/templates/ko
+@pkgdir share/cups/templates/fi
+@pkgdir share/cups/templates/da
+@pkgdir share/cups/profiles
+@pkgdir libexec/cups/driver
diff --git a/print/ghostscript-esp/PLIST b/print/ghostscript-esp/PLIST
index ffffea3493e..30f13f13da8 100644
--- a/print/ghostscript-esp/PLIST
+++ b/print/ghostscript-esp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 21:16:21 joerg Exp $
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
@@ -518,4 +518,3 @@ share/ghostscript/${GS_VERS}/lib/winmaps.ps
 share/ghostscript/${GS_VERS}/lib/wrfont.ps
 share/ghostscript/${GS_VERS}/lib/xlatmap
 share/ghostscript/${GS_VERS}/lib/zeroline.ps
-@unexec ${RMDIR} %D/share/ghostscript 2>/dev/null || ${TRUE}
diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST
index dee72574c90..208068aefb5 100644
--- a/print/ghostscript/PLIST
+++ b/print/ghostscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 21:16:21 joerg Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
@@ -678,4 +678,3 @@ share/ghostscript/${PKGVERSION}/lib/wftopfa.ps
 share/ghostscript/${PKGVERSION}/lib/winmaps.ps
 share/ghostscript/${PKGVERSION}/lib/wrfont.ps
 share/ghostscript/${PKGVERSION}/lib/zeroline.ps
-@unexec ${RMDIR} %D/share/ghostscript 2>/dev/null || ${TRUE}
diff --git a/print/ghostscript6/PLIST b/print/ghostscript6/PLIST
index 3176ec32a13..5005f22258c 100644
--- a/print/ghostscript6/PLIST
+++ b/print/ghostscript6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:16:21 joerg Exp $
 bin/bdftops
 bin/dvipdf
 bin/eps2eps
@@ -317,4 +317,3 @@ share/ghostscript/${GS_VERS}/vflib/kmapping.ps
 share/ghostscript/${GS_VERS}/vflib/koutline.ps
 share/ghostscript/${GS_VERS}/vflib/metrics2.ps
 share/ghostscript/${GS_VERS}/vflib/vchars.ps
-@unexec ${RMDIR} %D/share/ghostscript 2>/dev/null || ${TRUE}
diff --git a/print/gimp-print-lib/PLIST b/print/gimp-print-lib/PLIST
index 966fb16f141..e90511f599c 100644
--- a/print/gimp-print-lib/PLIST
+++ b/print/gimp-print-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/06/14 21:16:21 joerg Exp $
 bin/gimpprint-config
 include/gimp-print/gimp-print.h
 info/gimpprint.info
@@ -137,4 +137,4 @@ share/locale/pt/LC_MESSAGES/gimp-print.mo
 share/locale/sk/LC_MESSAGES/gimp-print.mo
 share/locale/sv/LC_MESSAGES/gimp-print.mo
 share/locale/uk/LC_MESSAGES/gimp-print.mo
-@exec ${MKDIR} %D/share/gimp-print/samples
+@pkgdir share/gimp-print/samples
diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST
index 4422a00ca89..7f359efa86c 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:16:22 joerg Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -314,4 +314,4 @@ share/locale/sv/LC_MESSAGES/gutenprint.mo
 share/locale/sv/gutenprint_sv.po
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
 share/locale/zh_TW/gutenprint_zh_TW.po
-@exec ${MKDIR} %D/lib/gutenprint/${INSTALLVERSION}/modules
+@pkgdir lib/gutenprint/${INSTALLVERSION}/modules
diff --git a/print/kpathsea/PLIST b/print/kpathsea/PLIST
index d6bc7e49225..0150709d989 100644
--- a/print/kpathsea/PLIST
+++ b/print/kpathsea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:11:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:16:22 joerg Exp $
 bin/kpseaccess
 bin/kpsereadlink
 bin/kpsestat
@@ -76,4 +76,4 @@ share/texmf/web2c/mktexnam
 share/texmf/web2c/mktexnam.opt
 share/texmf/web2c/mktexupd
 share/texmf/web2c/texmf.cnf
-@exec ${MKDIR} %D/share/texmf-dist
+@pkgdir share/texmf-dist
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 7ce2fd0efbc..ca8ded391c8 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/04/17 16:08:17 drochner Exp $
+# $NetBSD: Makefile,v 1.40 2009/06/14 21:16:22 joerg Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -47,6 +47,7 @@ CONFIGURE_ARGS+=	--disable-cms
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/poppler/
 	${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/
+	${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/print/poppler/PLIST b/print/poppler/PLIST
index 6498740ac84..2e6c9023261 100644
--- a/print/poppler/PLIST
+++ b/print/poppler/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:11:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:16:22 joerg Exp $
 lib/libpoppler.la
 lib/pkgconfig/poppler-splash.pc
 lib/pkgconfig/poppler.pc
 share/doc/poppler/README
 share/doc/poppler/README-XPDF
-@exec ${MKDIR} %D/include/poppler
diff --git a/print/teTeX3-texmfsrc/PLIST b/print/teTeX3-texmfsrc/PLIST
index 1ac63dd7e30..a015b1179b1 100644
--- a/print/teTeX3-texmfsrc/PLIST
+++ b/print/teTeX3-texmfsrc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:12:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:16:22 joerg Exp $
 share/texmf-dist/LICENSE.texmfsrc
 share/texmf-dist/release-tetex-texmfsrc.txt
 share/texmf-dist/source/README
@@ -3944,5 +3944,5 @@ share/texmf-dist/source/plain/impatient/usebook.tex
 share/texmf-dist/source/plain/impatient/usermacs.tex
 share/texmf-dist/source/plain/impatient/usingtex.tex
 share/texmf-dist/source/plain/impatient/xmptext.tex
-@exec ${MKDIR} %D/share/texmf-dist/source/latex/t2/etc/cmap
-@exec ${MKDIR} %D/share/texmf-dist/source/latex/aguplus
+@pkgdir share/texmf-dist/source/latex/t2/etc/cmap
+@pkgdir share/texmf-dist/source/latex/aguplus
diff --git a/print/tex-chemarrow/PLIST b/print/tex-chemarrow/PLIST
index cd233bf694d..2a0ddb73b4a 100644
--- a/print/tex-chemarrow/PLIST
+++ b/print/tex-chemarrow/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:12:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:16:22 joerg Exp $
 ${PKG_LOCALTEXMFPREFIX}/fonts/source/chemarrow/arrow.mf
 ${PKG_LOCALTEXMFPREFIX}/fonts/tfm/chemarrow/arrow.tfm
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/chemarrow/chemarrow.sty
@@ -7,4 +7,3 @@ share/fonts/chemarrow/arrow.afm
 share/fonts/chemarrow/arrow.inf
 share/fonts/chemarrow/arrow.pfb
 share/fonts/chemarrow/arrow.pfm
-@unexec ${RMDIR} %D/share/fonts 2> /dev/null || ${TRUE}
diff --git a/print/xpdf-greek/PLIST b/print/xpdf-greek/PLIST
index 24e26f02070..de2fda3dccf 100644
--- a/print/xpdf-greek/PLIST
+++ b/print/xpdf-greek/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:16:22 joerg Exp $
 share/xpdf/greek/Greek.nameToUnicode
 share/xpdf/greek/ISO-8859-7.unicodeMap
-@unexec ${RMDIR} share/xpdf 2>/dev/null || ${TRUE}