Thu Jan 28 19:27:04 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.3 -r1.4 pkgsrc/cad/nelma/Makefile
diff -r1.3 -r1.4 pkgsrc/cad/nelma/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/cad/nelma/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/cad/nelma/patches/patch-ab
cvs diff -r1.3 -r1.4 pkgsrc/cad/nelma/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/nelma/Makefile 2007/12/29 19:57:43 1.3
+++ pkgsrc/cad/nelma/Makefile 2010/01/28 19:27:03 1.4
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1# $NetBSD: Makefile,v 1.3 2007/12/29 19:57:43 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2010/01/28 19:27:03 joerg Exp $
2# 2#
3 3
4DISTNAME= nelma-3.0 4DISTNAME= nelma-3.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= cad 6CATEGORIES= cad
7MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/ 7MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/
8 8
9MAINTAINER= dmcmahill@NetBSD.org 9MAINTAINER= dmcmahill@NetBSD.org
10HOMEPAGE= http://www.tablix.org/~avian/nelma/ 10HOMEPAGE= http://www.tablix.org/~avian/nelma/
11COMMENT= Circuit board capacitance extraction tool 11COMMENT= Circuit board capacitance extraction tool
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16 17
 18INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
 19
17 20
18.include "../../devel/confuse/buildlink3.mk" 21.include "../../devel/confuse/buildlink3.mk"
19.include "../../devel/gettext-lib/buildlink3.mk" 22.include "../../devel/gettext-lib/buildlink3.mk"
20.include "../../graphics/png/buildlink3.mk" 23.include "../../graphics/png/buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/cad/nelma/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/nelma/distinfo 2007/03/02 23:08:12 1.3
+++ pkgsrc/cad/nelma/distinfo 2010/01/28 19:27:03 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2007/03/02 23:08:12 dmcmahill Exp $ 1$NetBSD: distinfo,v 1.4 2010/01/28 19:27:03 joerg Exp $
2 2
3SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c 3SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c
4RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad 4RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad
5Size (nelma-3.0.tar.gz) = 64078 bytes 5Size (nelma-3.0.tar.gz) = 64078 bytes
6SHA1 (patch-aa) = 0fdc453940b3cdba4383fcc769e81440826be265 6SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714
7SHA1 (patch-ab) = e82626a1d5658a5f154166d5efe54f0a16b84986 7SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0
cvs diff -r1.1.1.1 -r1.2 pkgsrc/cad/nelma/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/cad/nelma/patches/patch-aa 2007/03/02 01:59:47 1.1.1.1
+++ pkgsrc/cad/nelma/patches/patch-aa 2010/01/28 19:27:03 1.2
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/03/02 01:59:47 dmcmahill Exp $ 1$NetBSD: patch-aa,v 1.2 2010/01/28 19:27:03 joerg Exp $
2 2
3--- Makefile.orig 2006-12-10 18:14:29.000000000 +0000 3--- Makefile.orig 2006-12-10 18:14:29.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -1,18 +1,20 @@ 5@@ -1,18 +1,20 @@
6-export PREFIX = $(HOME)/software 6-export PREFIX = $(HOME)/software
7+PREFIX?= $(HOME)/software 7+PREFIX?= $(HOME)/software
8  8
9-all: nelma doxygen 9-all: nelma doxygen
10+all: nelma 10+all: nelma
11  11
12 install: nelma-install man-install 12 install: nelma-install man-install
13  13
14 nelma: 14 nelma:
15- $(MAKE) -C src all 15- $(MAKE) -C src all
16+ cd src && $(MAKE) PREFIX=$(PREFIX) all 16+ cd src && $(MAKE) PREFIX=$(PREFIX) all
17  17
18 nelma-install: 18 nelma-install:
19- $(MAKE) -C src install 19- $(MAKE) -C src install
20+ cd src && $(MAKE) PREFIX=$(PREFIX) install 20+ cd src && $(MAKE) PREFIX=$(PREFIX) install
21  21
22+INSTALL?= install 22+INSTALL?= install
23+INSTALL_MAN?= install 23+INSTALL_MAN?= install
24 man-install: 24 man-install:
25- install doc/nelma-cap.1 $(PREFIX)/man/man1 25- install doc/nelma-cap.1 $(PREFIX)/man/man1
26- install doc/nelma-drc.1 $(PREFIX)/man/man1 26- install doc/nelma-drc.1 $(PREFIX)/man/man1
27+ $(INSTALL_MAN) doc/nelma-cap.1 $(PREFIX)/man/man1 27+ $(BSD_INSTALL_MAN) doc/nelma-cap.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
28+ $(INSTALL_MAN) doc/nelma-drc.1 $(PREFIX)/man/man1 28+ $(BSD_INSTALL_MAN) doc/nelma-drc.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
29  29
30 doxygen: 30 doxygen:
31 doxygen 31 doxygen
32@@ -21,4 +23,4 @@ clean: 32@@ -21,4 +23,4 @@ clean:
33 rm -rf doc/html 33 rm -rf doc/html
34 $(MAKE) -C src clean 34 $(MAKE) -C src clean
35  35
36-.PHONY: all clean 36-.PHONY: all clean
37+.PHONY: all clean doxygen install man-install nelma nelma-install 37+.PHONY: all clean doxygen install man-install nelma nelma-install
cvs diff -r1.3 -r1.4 pkgsrc/cad/nelma/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/cad/nelma/patches/patch-ab 2007/03/02 23:08:12 1.3
+++ pkgsrc/cad/nelma/patches/patch-ab 2010/01/28 19:27:03 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.3 2007/03/02 23:08:12 dmcmahill Exp $ 1$NetBSD: patch-ab,v 1.4 2010/01/28 19:27:03 joerg Exp $
2 2
3--- src/Makefile.orig 2006-12-10 13:10:30.000000000 -0500 3--- src/Makefile.orig 2006-12-10 13:10:30.000000000 -0500
4+++ src/Makefile 4+++ src/Makefile
5@@ -25,31 +25,31 @@ DECOMPOSE_OBJS = pngutil.o \ 5@@ -25,31 +25,31 @@ DECOMPOSE_OBJS = pngutil.o \
6 error.o \ 6 error.o \
7 decompose.o 7 decompose.o
8  8
9-CONF_CFLAGS = $(shell pkg-config --cflags libconfuse) 9-CONF_CFLAGS = $(shell pkg-config --cflags libconfuse)
10-CONF_LIBS = $(shell pkg-config --libs libconfuse) 10-CONF_LIBS = $(shell pkg-config --libs libconfuse)
11+#CONF_CFLAGS = $(shell pkg-config --cflags libconfuse) 11+#CONF_CFLAGS = $(shell pkg-config --cflags libconfuse)
12+#CONF_LIBS = $(shell pkg-config --libs libconfuse) 12+#CONF_LIBS = $(shell pkg-config --libs libconfuse)
13  13
14-CFLAGS = -Wall -O3 -march=athlon-xp $(CONF_CFLAGS) -ffast-math 14-CFLAGS = -Wall -O3 -march=athlon-xp $(CONF_CFLAGS) -ffast-math
@@ -41,17 +41,17 @@ $NetBSD: patch-ab,v 1.3 2007/03/02 23:08 @@ -41,17 +41,17 @@ $NetBSD: patch-ab,v 1.3 2007/03/02 23:08
41- $(CC) $^ -o $@ $(LDFLAGS)  41- $(CC) $^ -o $@ $(LDFLAGS)
42+ $(CC) $(DECOMPOSE_OBJS) -o $@ $(LDFLAGS) $(LDADD) 42+ $(CC) $(DECOMPOSE_OBJS) -o $@ $(LDFLAGS) $(LDADD)
43  43
44 clean:  44 clean:
45 rm -f $(NELMA_CAP_OBJS) 45 rm -f $(NELMA_CAP_OBJS)
46@@ -58,8 +58,9 @@ clean:  46@@ -58,8 +58,9 @@ clean:
47 rm -f nelma-cap 47 rm -f nelma-cap
48 rm -f nelma-drc 48 rm -f nelma-drc
49  49
50+INSTALL_PROGRAM?= install 50+INSTALL_PROGRAM?= install
51 install: all 51 install: all
52- install nelma-cap $(PREFIX)/bin 52- install nelma-cap $(PREFIX)/bin
53- install nelma-drc $(PREFIX)/bin 53- install nelma-drc $(PREFIX)/bin
54+ $(INSTALL_PROGRAM) nelma-cap $(PREFIX)/bin 54+ $(BSD_INSTALL_PROGRAM) nelma-cap ${DESTDIR}$(PREFIX)/bin
55+ $(INSTALL_PROGRAM) nelma-drc $(PREFIX)/bin 55+ $(BSD_INSTALL_PROGRAM) nelma-drc ${DESTDIR}$(PREFIX)/bin
56  56
57 .PHONY: all clean install 57 .PHONY: all clean install