Thu Dec 17 21:27:32 2009 UTC ()
PKG_DESTDIR_SUPPORT


(abs)
diff -r1.16 -r1.17 pkgsrc/devel/ftnchek/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/ftnchek/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/ftnchek/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/devel/ftnchek/patches/patch-ab
cvs diff -r1.16 -r1.17 pkgsrc/devel/ftnchek/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ftnchek/Makefile 2007/02/20 19:04:11 1.16
+++ pkgsrc/devel/ftnchek/Makefile 2009/12/17 21:27:32 1.17
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.16 2007/02/20 19:04:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2009/12/17 21:27:32 abs Exp $
2 2
3DISTNAME= ftnchek-3.2.2 3DISTNAME= ftnchek-3.2.2
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.dsm.fordham.edu/~ftnchek/download/ 6MASTER_SITES= http://www.dsm.fordham.edu/~ftnchek/download/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.dsm.fordham.edu/~ftnchek/ 10HOMEPAGE= http://www.dsm.fordham.edu/~ftnchek/
11COMMENT= Static analyzer for Fortran programs 11COMMENT= Static analyzer for Fortran programs
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14CONFIGURE_ARGS+=--libdir=${PREFIX}/libexec 14CONFIGURE_ARGS+=--libdir=${PREFIX}/libexec
15CONFIGURE_ARGS+=--disable-submodel 15CONFIGURE_ARGS+=--disable-submodel
16 16
17USE_TOOLS+= soelim 17USE_TOOLS+= soelim
18 18
19.if (${MACHINE_ARCH} == "arm") 19.if (${MACHINE_ARCH} == "arm")
20CFLAGS+= -O1 20CFLAGS+= -O1
21.endif 21.endif
22 22
23pre-install: 23PKG_DESTDIR_SUPPORT= user-destdir
24 ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp 24
 25INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/emacs/site-lisp
 26INSTALLATION_DIRS+= share/doc/ftnchek share/doc/ftnchek/html
25 27
26post-install: 28post-install:
27 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftnchek 
28 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftnchek/html 
29 cd ${WRKSRC} && ${INSTALL_DATA} FAQ INSTALL LICENSE README \ 29 cd ${WRKSRC} && ${INSTALL_DATA} FAQ INSTALL LICENSE README \
30 ftnchek.man dcl2inc.man macro-doc.txt \ 30 ftnchek.man dcl2inc.man macro-doc.txt \
31 ${PREFIX}/share/doc/ftnchek 31 ${DESTDIR}${PREFIX}/share/doc/ftnchek
32 ${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/ftnchek/html 32 ${INSTALL_DATA} ${WRKSRC}/html/* \
 33 ${DESTDIR}${PREFIX}/share/doc/ftnchek/html
33 34
34.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/devel/ftnchek/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ftnchek/distinfo 2005/02/23 22:24:14 1.7
+++ pkgsrc/devel/ftnchek/distinfo 2009/12/17 21:27:32 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.7 2005/02/23 22:24:14 agc Exp $ 1$NetBSD: distinfo,v 1.8 2009/12/17 21:27:32 abs Exp $
2 2
3SHA1 (ftnchek-3.2.2.tar.bz2) = af1ed68d8270d464bf52cd5c415bada22d50ed21 3SHA1 (ftnchek-3.2.2.tar.bz2) = af1ed68d8270d464bf52cd5c415bada22d50ed21
4RMD160 (ftnchek-3.2.2.tar.bz2) = caa27cb97385742a8812cf400be490ced3e08d41 4RMD160 (ftnchek-3.2.2.tar.bz2) = caa27cb97385742a8812cf400be490ced3e08d41
5Size (ftnchek-3.2.2.tar.bz2) = 745015 bytes 5Size (ftnchek-3.2.2.tar.bz2) = 745015 bytes
6SHA1 (patch-aa) = 585621cbeb2a240cd44d35ebc04904db656f31b3 6SHA1 (patch-aa) = 06fd3c31a337e6d11cf10740da3f1ff40860dcde
7SHA1 (patch-ab) = 83af96a60c977fa25a1e423ae17cc61e56be3d84 7SHA1 (patch-ab) = 3d3801e7da1aed77ec8215fbf189333ab3f92b4e
cvs diff -r1.6 -r1.7 pkgsrc/devel/ftnchek/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/ftnchek/patches/Attic/patch-aa 2003/06/29 22:24:33 1.6
+++ pkgsrc/devel/ftnchek/patches/Attic/patch-aa 2009/12/17 21:27:32 1.7
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-aa,v 1.6 2003/06/29 22:24:33 jtb Exp $ 1$NetBSD: patch-aa,v 1.7 2009/12/17 21:27:32 abs Exp $
2 2
3--- configure.orig 3--- configure.orig 2003-04-01 03:19:35.000000000 +0000
4+++ configure 4+++ configure
5@@ -5816,6 +5806,7 @@ 5@@ -5816,6 +5816,7 @@ case $host_os in
6 if test -n "$GCC"; then 6 if test -n "$GCC"; then
7 OPT="-O2"; 7 OPT="-O2";
8 fi;; 8 fi;;
9+ netbsd*) ;; 9+ netbsd*) ;;
10 next*) 10 next*)
11 OPT="-O2";; 11 OPT="-O2";;
12  12
13@@ -5931,7 +5922,7 @@ 13@@ -5931,7 +5932,7 @@ else
14 fi 14 fi
15  15
16  16
17-CFLAGS="-DUNIX \$(OPT) $OS_FLAGS $PROTOFLAG \$(OPTIONS)" 17-CFLAGS="-DUNIX \$(OPT) $OS_FLAGS $PROTOFLAG \$(OPTIONS)"
18+CFLAGS="$CFLAGS -DUNIX \$(OPT) $OS_FLAGS $PROTOFLAG \$(OPTIONS)" 18+CFLAGS="$CFLAGS -DUNIX \$(OPT) $OS_FLAGS $PROTOFLAG \$(OPTIONS)"
19 echo "$as_me:$LINENO: result: Compile command is $CC $CFLAGS" >&5 19 echo "$as_me:$LINENO: result: Compile command is $CC $CFLAGS" >&5
20 echo "${ECHO_T}Compile command is $CC $CFLAGS" >&6 20 echo "${ECHO_T}Compile command is $CC $CFLAGS" >&6
21 echo "$as_me:$LINENO: result: \$(OPT) is $OPT" >&5 21 echo "$as_me:$LINENO: result: \$(OPT) is $OPT" >&5
cvs diff -r1.4 -r1.5 pkgsrc/devel/ftnchek/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/ftnchek/patches/patch-ab 2003/06/29 22:24:33 1.4
+++ pkgsrc/devel/ftnchek/patches/patch-ab 2009/12/17 21:27:32 1.5
@@ -1,68 +1,87 @@ @@ -1,68 +1,87 @@
1$NetBSD: patch-ab,v 1.4 2003/06/29 22:24:33 jtb Exp $ 1$NetBSD: patch-ab,v 1.5 2009/12/17 21:27:32 abs Exp $
2 2
3--- Makefile.in.orig 3--- Makefile.in.orig 2003-03-20 22:07:55.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -461,31 +461,17 @@ 5@@ -461,45 +461,31 @@ average.out: ftnchek.h
6 install: install-exe @INSTALL_MAN@ install-lisp 6 install: install-exe @INSTALL_MAN@ install-lisp
7  7
8 install-exe: ftnchek$(EXE) dcl2inc$(CMD) 8 install-exe: ftnchek$(EXE) dcl2inc$(CMD)
9- -$(RM) $(bindir)/ftnchek$(EXE) 9- -$(RM) $(bindir)/ftnchek$(EXE)
10- -$(MKDIR) -p $(bindir) 10- -$(MKDIR) -p $(bindir)
11- $(CP) ftnchek$(EXE) $(bindir) 11- $(CP) ftnchek$(EXE) $(bindir)
12- -$(STRIP) $(bindir)/ftnchek$(EXE) 12- -$(STRIP) $(bindir)/ftnchek$(EXE)
13- $(CHMOD) 755 $(bindir)/ftnchek$(EXE) 13- $(CHMOD) 755 $(bindir)/ftnchek$(EXE)
14- -$(MKDIR) -p $(libdir) 14- -$(MKDIR) -p $(libdir)
15- $(CP) dcl2inc.awk $(libdir)/dcl2inc.awk 15- $(CP) dcl2inc.awk $(libdir)/dcl2inc.awk
16- $(CHMOD) 644 $(libdir)/dcl2inc.awk 16- $(CHMOD) 644 $(libdir)/dcl2inc.awk
17- $(CP) dcl2inc$(CMD) $(bindir)/dcl2inc$(CMD) 17- $(CP) dcl2inc$(CMD) $(bindir)/dcl2inc$(CMD)
18- $(CHMOD) 755 $(bindir)/dcl2inc$(CMD) 18- $(CHMOD) 755 $(bindir)/dcl2inc$(CMD)
19- -$(RM) $(bindir)/fcl2vcg 19- -$(RM) $(bindir)/fcl2vcg
20+ $(BSD_INSTALL_PROGRAM) ftnchek$(EXE) $(bindir) 20+ $(BSD_INSTALL_PROGRAM) ftnchek$(EXE) $(DESTDIR)$(bindir)
21+ $(BSD_INSTALL_DATA_DIR) $(libdir) 21+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
22+ $(BSD_INSTALL_DATA) dcl2inc.awk $(libdir) 22+ $(BSD_INSTALL_DATA) dcl2inc.awk $(DESTDIR)$(libdir)
23+ $(BSD_INSTALL_SCRIPT) dcl2inc$(CMD) $(bindir) 23+ $(BSD_INSTALL_SCRIPT) dcl2inc$(CMD) $(DESTDIR)$(bindir)
24  24
25 # Install man pages, taking care to remove old formatted ones, because 25 # Install man pages, taking care to remove old formatted ones, because
26 # many man implentations fail to compare time stamps of raw and 26 # many man implentations fail to compare time stamps of raw and
27 # formatted files, and will show out-of-date formatted files. 27 # formatted files, and will show out-of-date formatted files.
28 install-man: ftnchek$(manext) 28 install-man: ftnchek$(manext)
29- -$(MKDIR) -p $(mandir)/man1 29- -$(MKDIR) -p $(mandir)/man1
30- $(CP) dcl2inc.man $(mandir)/man1/dcl2inc$(manext) 30- $(CP) dcl2inc.man $(mandir)/man1/dcl2inc$(manext)
31- -$(RM) $(mandir)/cat1/dcl2inc$(manext) 31- -$(RM) $(mandir)/cat1/dcl2inc$(manext)
32- $(CHMOD) 644 $(mandir)/man1/dcl2inc$(manext) 32- $(CHMOD) 644 $(mandir)/man1/dcl2inc$(manext)
33- $(CP) ftnchek$(manext) $(mandir)/man1/ftnchek$(manext) 33- $(CP) ftnchek$(manext) $(mandir)/man1/ftnchek$(manext)
34- -$(RM) $(mandir)/cat1/ftnchek$(manext) 34- -$(RM) $(mandir)/cat1/ftnchek$(manext)
35- $(CHMOD) 644 $(mandir)/man1/ftnchek$(manext) 35- $(CHMOD) 644 $(mandir)/man1/ftnchek$(manext)
36- -$(RM) $(mandir)/man1/fcl2vcg$(manext) 36- -$(RM) $(mandir)/man1/fcl2vcg$(manext)
37- -$(RM) $(mandir)/cat1/fcl2vcg$(manext) 37- -$(RM) $(mandir)/cat1/fcl2vcg$(manext)
38+ $(BSD_INSTALL_MAN) dcl2inc.man $(mandir)/man1/dcl2inc$(manext) 38+ $(BSD_INSTALL_MAN) dcl2inc.man $(DESTDIR)$(mandir)/man1/dcl2inc$(manext)
39+ $(BSD_INSTALL_MAN) ftnchek$(manext) $(mandir)/man1/ftnchek$(manext) 39+ $(BSD_INSTALL_MAN) ftnchek$(manext) $(DESTDIR)$(mandir)/man1/ftnchek$(manext)
40  40
41 # IRIX uses pre-formatted, packed man pages and nroff is not bundled with it. 41 # IRIX uses pre-formatted, packed man pages and nroff is not bundled with it.
42 install-man-sgi: catman 42 install-man-sgi: catman
43@@ -528,23 +514,8 @@ 43 if $(PACK) dcl2inc.cat ; \
 44 then \
 45- $(MV) dcl2inc.cat.z $(mandir)$(sgimansubdir)/dcl2inc.z ; \
 46- $(CHMOD) 644 $(mandir)$(sgimansubdir)/dcl2inc.z ; \
 47+ $(MV) dcl2inc.cat.z $(DESTDIR)$(mandir)$(sgimansubdir)/dcl2inc.z ; \
 48+ $(CHMOD) 644 $(DESTDIR)$(mandir)$(sgimansubdir)/dcl2inc.z ; \
 49 fi
 50 if $(PACK) ftnchek.cat ; \
 51 then \
 52- $(MV) ftnchek.cat.z $(mandir)$(sgimansubdir)/ftnchek.z ; \
 53- $(CHMOD) 644 $(mandir)$(sgimansubdir)/ftnchek.z ; \
 54+ $(MV) ftnchek.cat.z $(DESTDIR)$(mandir)$(sgimansubdir)/ftnchek.z ; \
 55+ $(CHMOD) 644 $(DESTDIR)$(mandir)$(sgimansubdir)/ftnchek.z ; \
 56 fi
 57- -$(RM) $(mandir)/fcl2vcg.z
 58+ -$(RM) $(DESTDIR)$(mandir)/fcl2vcg.z
 59
 60 # The catman target makes formatted ("cat") versions of the manpages
 61 # for use in install-man-sgi. These files are not in the standard
 62@@ -528,23 +514,8 @@ catman: dcl2inc.cat ftnchek.cat
44 # The emacs lisp file will be installed only if lispdir exists. It will 63 # The emacs lisp file will be installed only if lispdir exists. It will
45 # be byte-compiled if emacs is present. 64 # be byte-compiled if emacs is present.
46 install-lisp: 65 install-lisp:
47- @if test -d "$(lispdir)" ; \ 66- @if test -d "$(lispdir)" ; \
48- then \ 67- then \
49- echo $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \ 68- echo $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \
50- if $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \ 69- if $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \
51- then \ 70- then \
52- if test -x "$(EMACS)" ; \ 71- if test -x "$(EMACS)" ; \
53- then \ 72- then \
54- $(EMACS) -batch -f batch-byte-compile $(lispdir)/ftnchek.el ; \ 73- $(EMACS) -batch -f batch-byte-compile $(lispdir)/ftnchek.el ; \
55- else \ 74- else \
56- echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el"; \ 75- echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el"; \
57- fi \ 76- fi \
58- fi \ 77- fi \
59- else \ 78- else \
60- echo "$(lispdir) does not exist -- ftnchek.el not installed." ; \ 79- echo "$(lispdir) does not exist -- ftnchek.el not installed." ; \
61- echo "If you want to install ftnchek.el, create $(lispdir)" ; \ 80- echo "If you want to install ftnchek.el, create $(lispdir)" ; \
62- echo "or re-run make install with 'lispdir=path-to-site-lisp'" ; \ 81- echo "or re-run make install with 'lispdir=path-to-site-lisp'" ; \
63- fi 82- fi
64+ $(BSD_INSTALL_DATA_DIR) $(lispdir) 83+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(lispdir)
65+ $(BSD_INSTALL_DATA) ftnchek.el $(lispdir) 84+ $(BSD_INSTALL_DATA) ftnchek.el $(DESTDIR)$(lispdir)
66  85
67 # Remove everything that the install target installed. 86 # Remove everything that the install target installed.
68 uninstall: 87 uninstall: