diff options
| author | hubertf <hubertf> | 1998-02-12 13:33:01 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1998-02-12 13:33:01 +0000 |
| commit | 0bc57f27cffbd889bb259591c67d09542724f37d (patch) | |
| tree | fa2f1b3cebbe2c89ab4623b77747ff185b094b64 /editors | |
| parent | bea1014690482173a1b1a9c19d697c96692123f1 (diff) | |
| download | pkgsrc-0bc57f27cffbd889bb259591c67d09542724f37d.tar.gz | |
Better handling of binary stripping and DOC file handling, based on
suggestions from PR 4979 by Johnny Chi-Lung Lam <jlbg+@andrew.cmu.edu>.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 10 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ab | 20 | ||||
| -rw-r--r-- | editors/emacs/pkg/PLIST | 4 |
3 files changed, 26 insertions, 8 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 67b01b1f046..3ab4038dc75 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -3,7 +3,7 @@ # Date created: 11 October 1997 # Whom: hubertf # -# $NetBSD: Makefile,v 1.6 1998/02/09 00:29:14 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 1998/02/12 13:33:01 hubertf Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp # @@ -22,11 +22,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-pop --with-x --with-x-toolkit=lucid MAN1= emacs.1 etags.1 ctags.1 OPSYS!= uname -s +MAKE_ENV+= INSTALL_STRIP=${STRIPFLAG} \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" post-install: -.for file in emacs-20.2 emacsclient etags ctags b2m - strip ${PREFIX}/bin/${file} -.endfor + rm -f ${PREFIX}/share/emacs/20.2/etc/DOC-20.2.[2-9]* .if (${OPSYS} != "NetBSD") if [ ! -f ${PREFIX}/info/dir ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ @@ -35,7 +35,5 @@ post-install: .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir .endfor - cd ${PREFIX}/share/emacs/20.2/etc ; [ -f DOC-20.2.3 ] && rm -f DOC-20.2.2 - cd ${PREFIX}/share/emacs/20.2/etc ; [ -f DOC-20.2.2 ] && rm -f DOC-20.2.1 .include <bsd.port.mk> diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab new file mode 100644 index 00000000000..434c7060367 --- /dev/null +++ b/editors/emacs/patches/patch-ab @@ -0,0 +1,20 @@ +--- lib-src/Makefile.in.orig Mon Jul 28 07:50:45 1997 ++++ lib-src/Makefile.in Thu Feb 12 12:00:56 1998 +@@ -276,7 +276,7 @@ + if [ `(cd ${archlibdir} && /bin/pwd)` \ + != `(cd ${srcdir} && /bin/pwd)` ]; then \ + for file in ${SCRIPTS}; do \ +- $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \ ++ $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \ + done ; \ + fi + +@@ -288,7 +288,7 @@ + chmod a+rx ${bindir}/$${file}; \ + done + for file in ${INSTALLABLE_SCRIPTS} ; do \ +- $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \ ++ $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \ + chmod a+rx ${bindir}/$${file}; \ + done + diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST index 2524350d214..b64c00fa920 100644 --- a/editors/emacs/pkg/PLIST +++ b/editors/emacs/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1998/02/09 00:29:17 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/02/12 13:33:18 hubertf Exp $ bin/etags bin/ctags bin/emacsclient @@ -208,7 +208,7 @@ share/emacs/20.2/etc/ulimit.hack share/emacs/20.2/etc/vipcard.tex share/emacs/20.2/etc/viperCard.tex share/emacs/20.2/etc/yow.lines -share/emacs/20.2/etc/DOC-20.2.2 +share/emacs/20.2/etc/DOC-20.2.1 share/emacs/20.2/lisp/abbrev.el share/emacs/20.2/lisp/abbrevlist.el share/emacs/20.2/lisp/add-log.el |