summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskreuzer <skreuzer@FreeBSD.org>2009-04-23 13:57:57 +0000
committerskreuzer <skreuzer@FreeBSD.org>2009-04-23 13:57:57 +0000
commitb00966f25c44eebdb07eb2e330ae0ae4714ad369 (patch)
tree6745e6b6fe5e35af50bfc65a9ddcce3e69e1430d
parent4940dbcade3f991b40892a0adb22d4d9797096ad (diff)
downloadFreeBSD-ports-b00966f25c44eebdb07eb2e330ae0ae4714ad369.zip
FreeBSD-ports-b00966f25c44eebdb07eb2e330ae0ae4714ad369.tar.gz
Fix mtree issues caught by QAT
Approved by: wxs (mentor)
-rw-r--r--shells/zoidberg/Makefile34
-rw-r--r--shells/zoidberg/files/extra-patch-MANIFEST23
-rw-r--r--shells/zoidberg/pkg-plist1
3 files changed, 21 insertions, 37 deletions
diff --git a/shells/zoidberg/Makefile b/shells/zoidberg/Makefile
index 81921d4..e7571a4 100644
--- a/shells/zoidberg/Makefile
+++ b/shells/zoidberg/Makefile
@@ -25,11 +25,16 @@ RUN_DEPENDS= ${SITE_PERL}/Exporter/Tidy.pm:${PORTSDIR}/devel/p5-Exporter-Tidy \
${SITE_PERL}/Env/PS1.pm:${PORTSDIR}/devel/p5-Env-PS1
PERL_MODBUILD= yes
-CONFIGURE_ARGS= install_path=doc="${DOCSDIR}" \
- install_path=share="${DATADIR}" \
+CONFIGURE_ARGS= install_path=share="${DATADIR}" \
install_path=share="${ETCDIR}"
-PORTDOCS= *
+.if !defined(NOPORTDOCS)
+PORTDOCS= Changes README
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES= Menu.pl cpan.pl word_expansion.pl
+.endif
MAN1= zoid.1 zoiddevel.1 zoidfaq.1 zoiduser.1 zoidbuiltins.1
MAN3= Bundle::Zoidberg.3 \
@@ -50,18 +55,21 @@ MAN3= Bundle::Zoidberg.3 \
Zoidberg::Utils::GetOpt.3 \
Zoidberg::Utils::Output.3
-.include <bsd.port.pre.mk>
+post-install:
+ @${ECHO_CMD} ${PREFIX}/bin/zoid >> /etc/shells
-post-extract:
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-MANIFEST
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
.endif
-post-install:
- @${ECHO_CMD} ${PREFIX}/bin/zoid >> /etc/shells
-.if defined(NOPORTDOCS)
- ${ECHO_CMD} "share/doc/zoidberg/README" >> ${TMPPLIST}
- ${ECHO_CMD} "share/doc/zoidberg/Changes" >> ${TMPPLIST}
+.if !defined(NOPORTEXAMPLES)
+ @${MKDIR} ${EXAMPLESDIR}
+.for file in ${PORTEXAMPLES}
+ ${INSTALL_SCRIPT} ${WRKSRC}/doc/examples/${file} ${EXAMPLESDIR}
+.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/shells/zoidberg/files/extra-patch-MANIFEST b/shells/zoidberg/files/extra-patch-MANIFEST
deleted file mode 100644
index 419ab62..0000000
--- a/shells/zoidberg/files/extra-patch-MANIFEST
+++ /dev/null
@@ -1,23 +0,0 @@
---- MANIFEST.orig 2006-02-11 05:32:34.000000000 -0900
-+++ MANIFEST 2008-12-29 17:31:03.000000000 -0900
-@@ -9,12 +9,6 @@
- bin/AppRun
- bin/fluff
- Build.PL
--Changes
--configure
--doc/examples/cpan.pl
--doc/examples/Menu.pl
--doc/examples/word_expansion.pl
--doc/index.html
- etc/zoidrc
- lib/Bundle/Zoidberg.pm
- lib/Zoidberg.pm
-@@ -41,7 +35,6 @@
- man1/zoiduser.pod
- MANIFEST
- META.yml
--README
- share/AppInfo.xml
- share/pixmaps/zoid16.png
- share/pixmaps/zoid32.png
diff --git a/shells/zoidberg/pkg-plist b/shells/zoidberg/pkg-plist
index e30b158..654bb1f 100644
--- a/shells/zoidberg/pkg-plist
+++ b/shells/zoidberg/pkg-plist
@@ -81,4 +81,3 @@ etc/zoidberg/plugins/ReadLine.pl
@dirrm etc/zoidberg/plugins
@dirrm etc/zoidberg/pixmaps
@dirrm etc/zoidberg
-@dirrmtry %%DOCSDIR%%
OpenPOWER on IntegriCloud