diff options
| author | jtb <jtb@pkgsrc.org> | 2000-12-08 21:00:56 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2000-12-08 21:00:56 +0000 |
| commit | 374bbf01b79e543ac0ed9e67495006eff7d15bd3 (patch) | |
| tree | 977466d58f1b43b3cfc4478b679e57d46bf53d01 /devel | |
| parent | 1708f27d93299bcc0c01d87b926c534bd84fa68e (diff) | |
| download | pkgsrc-374bbf01b79e543ac0ed9e67495006eff7d15bd3.tar.gz | |
Make sure the ftnchek.el file gets installed (irrespective of Emacs itself
being installed already). Fixes a PLIST problem in recent pkgsrc/i386 bulk
build.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ftnchek/Makefile | 15 | ||||
| -rw-r--r-- | devel/ftnchek/files/patch-sum | 3 | ||||
| -rw-r--r-- | devel/ftnchek/patches/patch-aa | 31 | ||||
| -rw-r--r-- | devel/ftnchek/pkg/PLIST | 6 |
4 files changed, 44 insertions, 11 deletions
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile index a78b979e846..bd1309a897c 100644 --- a/devel/ftnchek/Makefile +++ b/devel/ftnchek/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/11/06 18:11:39 wennmach Exp $ +# $NetBSD: Makefile,v 1.2 2000/12/08 21:00:56 jtb Exp $ # DISTNAME= ftnchek @@ -19,14 +19,9 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftnchek ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftnchek/html - @(cd ${WRKSRC}; \ - for i in FAQ INSTALL LICENSE README ftnchek.man dcl2inc.man \ - macro-doc.txt; do \ - ${INSTALL_DATA} $$i ${PREFIX}/share/doc/ftnchek; \ - done; \ - cd html; \ - for j in *.html; do \ - ${INSTALL_DATA} $$j ${PREFIX}/share/doc/ftnchek/html; \ - done;) + @for i in FAQ INSTALL LICENSE README ftnchek.man dcl2inc.man \ + macro-doc.txt; do \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/ftnchek; done + ${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/ftnchek/html .include "../../mk/bsd.pkg.mk" diff --git a/devel/ftnchek/files/patch-sum b/devel/ftnchek/files/patch-sum new file mode 100644 index 00000000000..1315f95c554 --- /dev/null +++ b/devel/ftnchek/files/patch-sum @@ -0,0 +1,3 @@ +$NetBSD: patch-sum,v 1.1 2000/12/08 21:00:57 jtb Exp $ + +MD5 (patch-aa) = 3b37b10232a6df1f53aae8e26060400f diff --git a/devel/ftnchek/patches/patch-aa b/devel/ftnchek/patches/patch-aa new file mode 100644 index 00000000000..5afbefa0aad --- /dev/null +++ b/devel/ftnchek/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.1 2000/12/08 21:00:57 jtb Exp $ + +--- Makefile.in.orig Mon Oct 2 12:56:30 2000 ++++ Makefile.in +@@ -89,7 +89,7 @@ + manext = .1 + sgimansubdir = @sgimansubdir@ + libdir = @libdir@/ftnchek +-lispdir = @lispdir@ ++lispdir = $(prefix)/share/emacs/site-lisp + + # Define suffix for executables, for non-unix systems which have one. + EXE = @EXE@ +@@ -470,14 +470,9 @@ + + # The emacs lisp file will be installed only if lispdir exists. + install-lisp: +- @if test -d "$(lispdir)" ; \ +- then \ +- echo $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \ +- if $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \ +- then \ +- echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el"; \ +- fi \ +- fi ++ -mkdir -p $(lispdir) ++ -cp ftnchek.el $(lispdir)/ftnchek.el ++ -echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el" + + # Remove everything that the install target installed. + uninstall: diff --git a/devel/ftnchek/pkg/PLIST b/devel/ftnchek/pkg/PLIST index 10a2b3dc9c0..d1a9bb222f4 100644 --- a/devel/ftnchek/pkg/PLIST +++ b/devel/ftnchek/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/06 18:11:39 wennmach Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/12/08 21:00:57 jtb Exp $ bin/dcl2inc bin/ftnchek libexec/ftnchek/dcl2inc.awk @@ -72,5 +72,9 @@ share/doc/ftnchek/html/wordsize.html share/doc/ftnchek/html/wrap.html share/doc/ftnchek/macro-doc.txt share/emacs/site-lisp/ftnchek.el +@dirrm libexec/ftnchek @dirrm share/doc/ftnchek/html @dirrm share/doc/ftnchek +@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true +@unexec rmdir %D/share/emacs 2>/dev/null || true +@unexec rmdir %D/share 2>/dev/null || true |