diff options
author | crees <crees@FreeBSD.org> | 2012-09-04 03:22:00 +0800 |
---|---|---|
committer | crees <crees@FreeBSD.org> | 2012-09-04 03:22:00 +0800 |
commit | b4bc6b9351b6f3534af5b0bd7d917d0ba19cf70c (patch) | |
tree | beb77a5754cfbdcd5d28be9af5fae6ae8ba38573 | |
parent | f396330f9e9af56ece97209840df60915bab1013 (diff) | |
download | freebsd-ports-gnome-b4bc6b9351b6f3534af5b0bd7d917d0ba19cf70c.tar.gz freebsd-ports-gnome-b4bc6b9351b6f3534af5b0bd7d917d0ba19cf70c.tar.zst freebsd-ports-gnome-b4bc6b9351b6f3534af5b0bd7d917d0ba19cf70c.zip |
Fix plist issues by choosing which files to install, rather than trying to
delete them afterwards.
Submitted by: pointyhat (beat)
-rw-r--r-- | textproc/grap/Makefile | 16 | ||||
-rw-r--r-- | textproc/grap/pkg-plist | 5 |
2 files changed, 14 insertions, 7 deletions
diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile index d3dd0d8944fe..3845af041c8a 100644 --- a/textproc/grap/Makefile +++ b/textproc/grap/Makefile @@ -19,12 +19,24 @@ CONFIGURE_ARGS=--with-freebsd-ports CONFLICTS_INSTALL=heirloom-doctools-[0-9]* MAN1= grap.1 +PORTDOCS= README CHANGES COPYRIGHT grap.man .include <bsd.port.options.mk> +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.doc \ + ${MAN1PREFIX}/man/man1/${PORTNAME}.1 + ${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/grap.defines ${WRKSRC}/grap.tex.defines \ + ${DATADIR} .if ${PORT_OPTIONS:MDOCS} -post-install: - ${RM} -rf ${DOCSDIR} + ${MKDIR} ${DOCSDIR} +. for d in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/$d ${DOCSDIR} +. endfor .endif + ${MKDIR} ${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) .include <bsd.port.mk> diff --git a/textproc/grap/pkg-plist b/textproc/grap/pkg-plist index 5d702eee1097..163f670814da 100644 --- a/textproc/grap/pkg-plist +++ b/textproc/grap/pkg-plist @@ -1,8 +1,4 @@ bin/grap -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/grap.man %%DATADIR%%/grap.defines %%DATADIR%%/grap.tex.defines %%EXAMPLESDIR%%/400mpairs.d @@ -24,4 +20,3 @@ bin/grap %%EXAMPLESDIR%%/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result @dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% |