Minor pkg-plist fixes.

PR:		23806
Submitted by:	Yen-Ming Lee <leeym@bsd.ce.ntu.edu.tw>

9 files changed, 40 insertions, 26 deletions

diff --git a/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist
index 04420f8129d8..00aa50692937 100644
--- a/devel/p5-C-Scan/pkg-plist
+++ b/devel/p5-C-Scan/pkg-plist
@@ -1,3 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/C/Scan.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C/Scan/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C/Scan
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/C 2> /dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/C 2> /dev/null || true
diff --git a/games/smacx/pkg-plist b/games/smacx/pkg-plist
index 2522a3e007e6..c748a81f5e07 100644
--- a/games/smacx/pkg-plist
+++ b/games/smacx/pkg-plist
@@ -591,3 +591,4 @@ games/smacx/smacx
 @dirrm games/smacx/data/facs
 @dirrm games/smacx/data
 @dirrm games/smacx
+@unexec rmdir %D/games 2> /dev/null || true
diff --git a/misc/amanda/pkg-plist b/misc/amanda/pkg-plist
index 2c3c43345a96..1cd04bc06f21 100644
--- a/misc/amanda/pkg-plist
+++ b/misc/amanda/pkg-plist
@@ -1,3 +1,17 @@
+bin/amadmin
+bin/amcheck
+bin/amcheckdb
+bin/amcleanup
+bin/amdump
+bin/amflush
+bin/amlabel
+bin/amoverview
+bin/amrecover
+bin/amrestore
+bin/amrmtape
+bin/amtape
+bin/amtoc
+bin/amverify
 libexec/amanda/amandad
 libexec/amanda/amgetidx
 libexec/amanda/amidxtaped
@@ -15,32 +29,19 @@ libexec/amanda/no-changer
 libexec/amanda/patch-system
 libexec/amanda/planner
 libexec/amanda/reporter
-libexec/amanda/rth-changer 
+libexec/amanda/rth-changer
 libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
 libexec/amanda/sendbackup-dump
-libexec/amanda/sendbackup-gnutar 
+libexec/amanda/sendbackup-gnutar
 libexec/amanda/sendindex
 libexec/amanda/sendsize
 libexec/amanda/taper
 libexec/amanda/versionsuffix
-bin/amadmin
-bin/amcheck
-bin/amcheckdb
-bin/amcleanup
-bin/amdump
-bin/amflush
-bin/amlabel
-bin/amoverview
-bin/amrecover
-bin/amrestore
-bin/amrmtape
-bin/amtape
-bin/amtoc
-bin/amverify
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-generic.conf
 share/examples/amanda/disklist
 @dirrm share/examples/amanda
 @dirrm libexec/amanda
+@unexec rmdir %D/etc/amanda 2> /dev/null || true
diff --git a/news/slurp/pkg-plist b/news/slurp/pkg-plist
index 8321cae13d69..6daf07d7df11 100644
--- a/news/slurp/pkg-plist
+++ b/news/slurp/pkg-plist
@@ -1,2 +1,5 @@
 news/bin/slurp
 news/lib/slurp.sys
+@unexec rmdir %D/news/lib 2> /dev/null || true
+@unexec rmdir %D/news/bin 2> /dev/null || true
+@unexec rmdir %D/news 2> /dev/null || true
diff --git a/print/tr2latex/pkg-plist b/print/tr2latex/pkg-plist
index a671b77df014..b156f1193e1c 100644
--- a/print/tr2latex/pkg-plist
+++ b/print/tr2latex/pkg-plist
@@ -1,3 +1,7 @@
 bin/tr2latex
 share/texmf/tex/latex/misc/troffman.sty
 share/texmf/tex/latex/misc/troffms.sty
+@unexec rmdir %D/share/texmf/tex/latex/misc 2> /dev/null || true
+@unexec rmdir %D/share/texmf/tex/latex 2> /dev/null || true
+@unexec rmdir %D/share/texmf/tex 2> /dev/null || true
+@unexec rmdir %D/share/texmf 2> /dev/null || true
diff --git a/russian/cyrproxy/pkg-plist b/russian/cyrproxy/pkg-plist
index e3ca05388644..b063f381ea12 100644
--- a/russian/cyrproxy/pkg-plist
+++ b/russian/cyrproxy/pkg-plist
@@ -17,9 +17,11 @@ share/cyrproxy/mac-koi8
 share/cyrproxy/win-alt
 share/cyrproxy/win-iso
 share/cyrproxy/win-koi8
-share/doc/cyrproxy/History
-share/doc/cyrproxy/README
-share/doc/cyrproxy/README.http
+%%PORTDOCS%%share/doc/cyrproxy/History
+%%PORTDOCS%%share/doc/cyrproxy/README
+%%PORTDOCS%%share/doc/cyrproxy/README.http
 www/cgi-bin/cyrwww
 @dirrm share/cyrproxy
-@dirrm share/doc/cyrproxy
+%%PORTDOCS%%@dirrm share/doc/cyrproxy
+@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
+@unexec rmdir %D/www 2> /dev/null || true
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 9d90a48900a4..b91199bd7e08 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -16,13 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 
 RESTRICTED=	"Crypto; export-controlled"
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Crypt::IDEA.3
 
-do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-			CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-IDEA/pkg-plist b/security/p5-Crypt-IDEA/pkg-plist
index a403c22f2e17..f7406776a740 100644
--- a/security/p5-Crypt-IDEA/pkg-plist
+++ b/security/p5-Crypt-IDEA/pkg-plist
@@ -1,6 +1,8 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/IDEA.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt/IDEA.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt/IDEA
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
diff --git a/www/fxhtml/pkg-plist b/www/fxhtml/pkg-plist
index 5e4401702c5e..09bcdc1bda78 100644
--- a/www/fxhtml/pkg-plist
+++ b/www/fxhtml/pkg-plist
@@ -1,2 +1,5 @@
 www/data/demo.fx
 www/cgi-bin/fxhtml
+@unexec rmdir %D/www/data 2> /dev/null || true
+@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
+@unexec rmdir %D/www 2> /dev/null || true