diff options
author | salo <salo@pkgsrc.org> | 2003-01-19 06:52:54 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2003-01-19 06:52:54 +0000 |
commit | 235ccbe10197de658b9e130bbf84c3e51528bc54 (patch) | |
tree | c113467448f8852bf0356e69123b6b45b97afa46 /editors | |
parent | a44600312f84551b1faacb0587aaa9024711f762 (diff) | |
download | pkgsrc-235ccbe10197de658b9e130bbf84c3e51528bc54.tar.gz |
s/INSTALL_*/BSD_INSTALL_*/ in patches, remove unnecessary MAKE_ENV.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/xemacs-current/Makefile | 3 | ||||
-rw-r--r-- | editors/xemacs-current/distinfo | 4 | ||||
-rw-r--r-- | editors/xemacs-current/patches/patch-aa | 6 | ||||
-rw-r--r-- | editors/xemacs-nox11/Makefile | 4 | ||||
-rw-r--r-- | editors/xemacs/Makefile | 4 | ||||
-rw-r--r-- | editors/xemacs/distinfo | 6 | ||||
-rw-r--r-- | editors/xemacs/patches/patch-ab | 8 | ||||
-rw-r--r-- | editors/xemacs/patches/patch-ac | 6 |
8 files changed, 18 insertions, 23 deletions
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 23c2188019b..55231cf4532 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/01/18 05:45:42 uebayasi Exp $ +# $NetBSD: Makefile,v 1.15 2003/01/19 06:52:55 salo Exp $ DISTNAME= xemacs-21.5.10 CATEGORIES= editors @@ -82,7 +82,6 @@ CONFIGURE_ARGS+= --site-includes=${PREFIX}/include:${WRKDIR} CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib CFLAGS+= -Dunix -MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" post-patch: @${RM} -f ${WRKSRC}/etc/ctags.1.orig diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo index a160a14ee9a..26ea3bb6c09 100644 --- a/editors/xemacs-current/distinfo +++ b/editors/xemacs-current/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2003/01/18 05:45:42 uebayasi Exp $ +$NetBSD: distinfo,v 1.4 2003/01/19 06:52:56 salo Exp $ SHA1 (xemacs-21.5.10.tar.gz) = 429818840413950366af1552e687db565cb4bb30 Size (xemacs-21.5.10.tar.gz) = 12748210 bytes -SHA1 (patch-aa) = 4966a5bda4456976cdc1b05eb5c6bb5cf4f41250 +SHA1 (patch-aa) = 48f0b47ff872338587b3118075e10413febf2639 SHA1 (patch-ab) = 62a968f19d1b2b9efc5f8c3cf3e612f6a1dc7df2 SHA1 (patch-ac) = 1ffaa2c5c425de6abd8f76d262762d21d8c7d0af SHA1 (patch-ad) = 14c5e0f31801648fbdb7f96e5d26cb505a59b741 diff --git a/editors/xemacs-current/patches/patch-aa b/editors/xemacs-current/patches/patch-aa index b3101332688..09cb1aefaf1 100644 --- a/editors/xemacs-current/patches/patch-aa +++ b/editors/xemacs-current/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2003/01/18 05:45:43 uebayasi Exp $ +$NetBSD: patch-aa,v 1.3 2003/01/19 06:52:56 salo Exp $ --- Makefile.in.in.orig Sat Jan 18 12:23:29 2003 +++ Makefile.in.in @@ -10,9 +10,9 @@ $NetBSD: patch-aa,v 1.2 2003/01/18 05:45:43 uebayasi Exp $ - chmod 0644 ${mandir}/$${page}${manext} ; \ + if [ $${page} = etags ] || [ $${page} = ctags ] ; \ + then \ -+ ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \ ++ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \ + else \ -+ ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ ++ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ + fi \ done @echo "If you would like to save approximately 2M of disk space, do" diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index 73783af1e36..7bb4e46dd21 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/01/17 02:40:25 uebayasi Exp $ +# $NetBSD: Makefile,v 1.4 2003/01/19 06:52:56 salo Exp $ DISTNAME= xemacs-21.1.14 PKGNAME= xemacs-nox11-21.1.14 @@ -103,8 +103,6 @@ CONFIGURE_ARGS+= --without-tiff # XXX -nox CONFIGURE_ARGS+= --without-xpm # XXX -nox CFLAGS+= -Dunix -MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" -MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" post-extract: for FILE in ${EXTRA_FILES}; do \ diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index c2637cf8479..3c8abca0497 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2002/12/01 16:51:16 magick Exp $ +# $NetBSD: Makefile,v 1.55 2003/01/19 06:52:54 salo Exp $ DISTNAME= xemacs-21.1.14 PKGREVISION= 4 @@ -92,8 +92,6 @@ CONFIGURE_ARGS+= --site-includes=${PREFIX}/include:${WRKDIR} CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib CFLAGS+= -Dunix -MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" -MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" post-extract: for FILE in ${EXTRA_FILES}; do \ diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index 8354ee21a94..d2b6e82deca 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/09 16:32:16 magick Exp $ +$NetBSD: distinfo,v 1.5 2003/01/19 06:52:54 salo Exp $ SHA1 (xemacs/xemacs-21.1.14.tar.bz2) = 9be60177dfaa2be8b847ce15b26d7009afa9b7b9 Size (xemacs/xemacs-21.1.14.tar.bz2) = 5482480 bytes @@ -7,8 +7,8 @@ Size (xemacs/xemacs-21.1.14-elc.tar.gz) = 784709 bytes SHA1 (xemacs/xemacs-21.1.14-info.tar.gz) = 73942f88cbdc477a1e8bfbb0a562235381c3f368 Size (xemacs/xemacs-21.1.14-info.tar.gz) = 1506819 bytes SHA1 (patch-aa) = d3020b5838ec8854a495dc8c310f0719bbf527b4 -SHA1 (patch-ab) = 7d8f6b362337a7279900c28bc078091980f5e369 -SHA1 (patch-ac) = 166cbae328cfa20902f73b3861bb591339f37e47 +SHA1 (patch-ab) = 01f962bd179e2de5649f9dcd419e1db0cccc6945 +SHA1 (patch-ac) = 7990c45d2a44c7786826fc552d3c4609d77af69e SHA1 (patch-ad) = e2a70a64f0659ffda6dd27b37512e4dc5bd4ecf4 SHA1 (patch-af) = 9a6dc52819dfa1cf85802f6cc99db30e8ba363fc SHA1 (patch-ah) = 61a430e027a47ce321721737d42d09ca71ecd7ec diff --git a/editors/xemacs/patches/patch-ab b/editors/xemacs/patches/patch-ab index e9d6174176a..26586c164e8 100644 --- a/editors/xemacs/patches/patch-ab +++ b/editors/xemacs/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $ +$NetBSD: patch-ab,v 1.3 2003/01/19 06:52:55 salo Exp $ --- lib-src/Makefile.in.in.orig Mon Jun 14 08:32:00 1999 +++ lib-src/Makefile.in.in Wed Dec 8 09:14:11 1999 @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $ != "`(cd ${srcdir} && $(pwd))`"; then \ for f in ${SCRIPTS}; do \ - (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \ -+ (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \ ++ (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \ done ; \ fi @@ -37,9 +37,9 @@ $NetBSD: patch-ab,v 1.2 1999/12/08 08:18:25 rh Exp $ - (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ + if [ $${file} = rcs-checkin ] || [ $${file} = send-pr ] ; \ + then \ -+ (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \ ++ (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \ + else \ -+ (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(BSD_INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \ + fi \ done diff --git a/editors/xemacs/patches/patch-ac b/editors/xemacs/patches/patch-ac index 87afa83752a..f5b7d65ba4d 100644 --- a/editors/xemacs/patches/patch-ac +++ b/editors/xemacs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2002/10/09 16:32:17 magick Exp $ +$NetBSD: patch-ac,v 1.4 2003/01/19 06:52:55 salo Exp $ --- Makefile.in.orig Mon Dec 18 04:03:32 2000 +++ Makefile.in @@ -19,9 +19,9 @@ $NetBSD: patch-ac,v 1.3 2002/10/09 16:32:17 magick Exp $ - chmod 0644 ${mandir}/$${page}${manext} ; \ + if [ $${page} = etags ] || [ $${page} = ctags ] ; \ + then \ -+ ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \ ++ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/xemacs-$${page}${manext} ; \ + else \ -+ ${INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ ++ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ + fi \ done @echo "If you would like to save approximately 2M of disk space, do" |