From 9402458d50c88b9e7efe082620f4b022575e9e97 Mon Sep 17 00:00:00 2001 From: clement Date: Fri, 27 Feb 2004 12:10:37 +0000 Subject: - Pacify portlint and use misc macros - remove pkg-plist (fastjar and stuffit) --- archivers/fastjar/Makefile | 6 ++++-- archivers/fastjar/pkg-plist | 5 ----- archivers/macutils/Makefile | 1 - archivers/stuffit/Makefile | 5 +++-- archivers/stuffit/pkg-plist | 2 -- archivers/ucl/Makefile | 8 +++++--- archivers/ucl/pkg-plist | 3 --- 7 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 archivers/fastjar/pkg-plist delete mode 100644 archivers/stuffit/pkg-plist (limited to 'archivers') diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile index fb9168273458..53262ab7040c 100644 --- a/archivers/fastjar/Makefile +++ b/archivers/fastjar/Makefile @@ -18,11 +18,13 @@ COMMENT= A version of JDK's `jar' command written entirely in C GNU_CONFIGURE= yes USE_GMAKE= yes +PORTDOCS= CHANGES README +PLIST_FILES= bin/fastjar bin/grepjar post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/fastjar - cd ${WRKSRC} && ${INSTALL_DATA} CHANGES README ${PREFIX}/share/doc/fastjar/ + ${MKDIR} ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ @${CAT} ${PKGMESSAGE} .endif diff --git a/archivers/fastjar/pkg-plist b/archivers/fastjar/pkg-plist deleted file mode 100644 index 82f4dcb1ebf0..000000000000 --- a/archivers/fastjar/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/fastjar -bin/grepjar -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile index 44172bede62b..ec9e7fb44562 100644 --- a/archivers/macutils/Makefile +++ b/archivers/macutils/Makefile @@ -22,7 +22,6 @@ MAN1= macunpack.1 hexbin.1 macsave.1 macstream.1 binhex.1 tomac.1 \ frommac.1 macutil.1 BINDIR= ${PREFIX}/bin -DOCDIR= ${PREFIX}/share/doc/macutils DOCFILES= README.crc README.hexbin README.macput README.unpit \ README.zoom README.crc.orig README.macget README.scan \ README.unsit ../README diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile index 8d2f9669c56c..9c8e55df213d 100644 --- a/archivers/stuffit/Makefile +++ b/archivers/stuffit/Makefile @@ -29,6 +29,7 @@ STRIP= # empty: do not strip linux binary during INSTALL_PROGRAM WRKSRC= ${WRKDIR} STUFFIT_FILES= bin/unstuff bin/stuff STUFFIT_MAN= man/man1/stuff.1 man/man1/unstuff.1 +PLIST_FILES= ${STUFFIT_FILES} MAN1= stuff.1 unstuff.1 @@ -38,10 +39,10 @@ post-fetch: do-install: .for sFile in ${STUFFIT_FILES} ${INSTALL_PROGRAM} ${WRKSRC}/${sFile} ${PREFIX}/bin - brandelf -t Linux ${PREFIX}/${sFile} + ${BRANDELF} -t Linux ${PREFIX}/${sFile} .endfor .for mFile in ${STUFFIT_MAN} - ${INSTALL_MAN} ${WRKSRC}/${mFile} ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${mFile} ${MANPREFIX}/man/man1 .endfor .include diff --git a/archivers/stuffit/pkg-plist b/archivers/stuffit/pkg-plist deleted file mode 100644 index 52472bdefcf5..000000000000 --- a/archivers/stuffit/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/stuff -bin/unstuff diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile index d247459a6967..803dd5f250df 100644 --- a/archivers/ucl/Makefile +++ b/archivers/ucl/Makefile @@ -17,13 +17,15 @@ INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --enable-shared +PORTDOCS= COPYING README + post-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/uclpack \ ${PREFIX}/bin/uclpack .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/${PORTNAME} -.for file in COPYING README - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/${PORTNAME} + @${MKDIR} ${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/archivers/ucl/pkg-plist b/archivers/ucl/pkg-plist index 743e62b8a848..47aaf53ed07f 100644 --- a/archivers/ucl/pkg-plist +++ b/archivers/ucl/pkg-plist @@ -5,7 +5,4 @@ include/ucl/uclconf.h lib/libucl.a lib/libucl.so lib/libucl.so.1 -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/ucl -- cgit