diff options
| author | wiz <wiz@pkgsrc.org> | 2003-09-22 09:06:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-09-22 09:06:35 +0000 |
| commit | e0baed69b81dbd056c500f09d454b8291b0c9675 (patch) | |
| tree | c38f61263c69c98290d4c35d9862fdbccb556064 | |
| parent | 5320cda02ad1fcb2752a84d8cc194c034942c12d (diff) | |
| download | pkgsrc-e0baed69b81dbd056c500f09d454b8291b0c9675.tar.gz | |
Fix latex2rtf to not hardcode install(1). From Jonathan Perkins in PR 22881.
| -rw-r--r-- | converters/latex2rtf/Makefile | 14 | ||||
| -rw-r--r-- | converters/latex2rtf/distinfo | 4 | ||||
| -rw-r--r-- | converters/latex2rtf/patches/patch-aa | 22 |
3 files changed, 13 insertions, 27 deletions
diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile index b30dcd492f0..9b2db25fdd5 100644 --- a/converters/latex2rtf/Makefile +++ b/converters/latex2rtf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/08/09 10:35:48 seb Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/22 09:06:35 wiz Exp $ # DISTNAME= latex2rtf-1.8aa @@ -14,8 +14,8 @@ USE_BUILDLINK2= # defined MAKE_FLAGS+= XCFLAGS="${CFLAGS}" INFO_FILES= latex2rtf.info - -INSTALL_TARGET= simple_install simple_cfg_install +SUPPORT_FILES= direct.cfg fonts.cfg ignore.cfg english.cfg german.cfg \ + spanish.cfg post-extract: ${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.in @@ -25,10 +25,16 @@ do-configure: ${SED} < ${WRKSRC}/${MAKEFILE}.in > ${WRKSRC}/${MAKEFILE} \ -e 's:@PREFIX@:${PREFIX}:' -post-install: +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/latex2rtf ${PREFIX}/bin/latex2rtf + ${INSTALL_MAN} ${WRKSRC}/latex2rtf.1 ${PREFIX}/man/man1/latex2rtf.1 ${INSTALL_DATA} ${WRKSRC}/doc/latex2rtf.info ${PREFIX}/info/latex2rtf.info ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/latex2rtf ${INSTALL_DATA} ${WRKSRC}/doc/l2r.html ${PREFIX}/share/doc/latex2rtf/latex2rtf.html ${INSTALL_DATA} ${WRKSRC}/doc/l2r.pdf ${PREFIX}/share/doc/latex2rtf/latex2rtf.pdf + ${INSTALL_DATA_DIR} ${PREFIX}/share/latex2rtf +.for FILE in ${SUPPORT_FILES} + ${INSTALL_DATA} ${WRKSRC}/cfg/${FILE} ${PREFIX}/share/latex2rtf/${FILE} +.endfor .include "../../mk/bsd.pkg.mk" diff --git a/converters/latex2rtf/distinfo b/converters/latex2rtf/distinfo index bd092f487e1..673d88b091c 100644 --- a/converters/latex2rtf/distinfo +++ b/converters/latex2rtf/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:28:01 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/09/22 09:06:35 wiz Exp $ SHA1 (latex2rtf-1.8aa.tar.gz) = ab02cf1d069ba05400b2cb5df2182a1c139d4ae8 Size (latex2rtf-1.8aa.tar.gz) = 338481 bytes -SHA1 (patch-aa) = c58421e1edbe4606f550e96c620d6fa5b5b1d6eb +SHA1 (patch-aa) = 3ee116cc90138a17bf734b2e38a82c1e194119be diff --git a/converters/latex2rtf/patches/patch-aa b/converters/latex2rtf/patches/patch-aa index ab16ee4603b..e5a3182e38a 100644 --- a/converters/latex2rtf/patches/patch-aa +++ b/converters/latex2rtf/patches/patch-aa @@ -1,27 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/03/08 00:20:17 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2003/09/22 09:06:36 wiz Exp $ --- ./Makefile.in.orig Tue Mar 7 23:37:35 2000 +++ ./Makefile.in Tue Mar 7 23:45:10 2000 -@@ -83,13 +83,13 @@ - DIR_USER=root - BIN_USER=root - DAT_USER=root --DIR_GROUP=root --BIN_GROUP=root --DAT_GROUP=root -+DIR_GROUP=wheel -+BIN_GROUP=wheel -+DAT_GROUP=wheel - # If you have the program install, use the following definitions --INST_DIR=$(INSTALL) -g $(DIR_GROUP) -o $(DIR_USER) -d -m $(BIN_MODE) --INST_BIN=$(INSTALL) -g $(BIN_GROUP) -o $(BIN_USER) -m $(DIR_MODE) --INST_DAT=$(INSTALL) -g $(DAT_GROUP) -o $(DAT_USER) -m $(DAT_MODE) -+INST_DIR=$(INSTALL) -c -g $(DIR_GROUP) -o $(DIR_USER) -d -m $(BIN_MODE) -+INST_BIN=$(INSTALL) -c -g $(BIN_GROUP) -o $(BIN_USER) -m $(DIR_MODE) -+INST_DAT=$(INSTALL) -c -g $(DAT_GROUP) -o $(DAT_USER) -m $(DAT_MODE) - CHOWN_DIR=true - CHOWN_BIN=true - CHOWN_DAT=true @@ -115,8 +115,8 @@ # # Where support files are searched for by the executable |