Wed Aug 4 02:46:04 2010 UTC ()
Update to nelma-3.2.

Changes are:

Make nelma compile with libpng-1.4.x (thanks to Thomas Klausner)

Minor Makefile fixes.


(dmcmahill)
diff -r1.5 -r1.6 pkgsrc/cad/nelma/Makefile
diff -r1.5 -r1.6 pkgsrc/cad/nelma/distinfo
diff -r1.2 -r1.3 pkgsrc/cad/nelma/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/cad/nelma/patches/patch-ab
diff -r1.1 -r0 pkgsrc/cad/nelma/patches/patch-ac
cvs diff -r1.5 -r1.6 pkgsrc/cad/nelma/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/nelma/Makefile 2010/06/13 22:43:55 1.5
+++ pkgsrc/cad/nelma/Makefile 2010/08/04 02:46:03 1.6
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2010/08/04 02:46:03 dmcmahill Exp $
2# 2#
3 3
4DISTNAME= nelma-3.0 4DISTNAME= nelma-3.2
5PKGREVISION= 2 
6CATEGORIES= cad 5CATEGORIES= cad
7MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/ 6MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/
8 7
9MAINTAINER= dmcmahill@NetBSD.org 8MAINTAINER= dmcmahill@NetBSD.org
10HOMEPAGE= http://www.tablix.org/~avian/nelma/ 9HOMEPAGE= http://www.tablix.org/~avian/nelma/
11COMMENT= Circuit board capacitance extraction tool 10COMMENT= Circuit board capacitance extraction tool
12 11
13PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
17 16
18INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 17INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
cvs diff -r1.5 -r1.6 pkgsrc/cad/nelma/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/nelma/distinfo 2010/06/13 22:43:55 1.5
+++ pkgsrc/cad/nelma/distinfo 2010/08/04 02:46:03 1.6
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.5 2010/06/13 22:43:55 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2010/08/04 02:46:03 dmcmahill Exp $
2 2
3SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c 3SHA1 (nelma-3.2.tar.gz) = 2a39a35527db03babcb09e992b29cbc659923c71
4RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad 4RMD160 (nelma-3.2.tar.gz) = 657decc5243147bdb6d80329a0604d76ddd0a91d
5Size (nelma-3.0.tar.gz) = 64078 bytes 5Size (nelma-3.2.tar.gz) = 64618 bytes
6SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714 6SHA1 (patch-aa) = 284395f49ca448aebaace06673fc1d14f325112c
7SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0 7SHA1 (patch-ab) = 48eb0c1b1c8c6f0848d98cf1cdc7ab3126722fe0
8SHA1 (patch-ac) = 5585eed126e7bd3133cb412aaf191a7c363dcc1c 
cvs diff -r1.2 -r1.3 pkgsrc/cad/nelma/patches/patch-aa (expand / switch to unified diff)

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

--- pkgsrc/cad/nelma/patches/patch-ab 2010/01/28 19:27:03 1.4
+++ pkgsrc/cad/nelma/patches/patch-ab 2010/08/04 02:46:03 1.5
@@ -1,57 +1,14 @@ @@ -1,57 +1,14 @@
1$NetBSD: patch-ab,v 1.4 2010/01/28 19:27:03 joerg Exp $ 1$NetBSD: patch-ab,v 1.5 2010/08/04 02:46:03 dmcmahill Exp $
2 2
3--- src/Makefile.orig 2006-12-10 13:10:30.000000000 -0500 3--- src/Makefile.orig 2010-07-05 19:20:28.000000000 +0000
4+++ src/Makefile 4+++ src/Makefile
5@@ -25,31 +25,31 @@ DECOMPOSE_OBJS = pngutil.o \ 5@@ -61,7 +61,7 @@ clean:
6 error.o \ 6 INSTALL_PROGRAM?= install
7 decompose.o 
8  7
9-CONF_CFLAGS = $(shell pkg-config --cflags libconfuse) 
10-CONF_LIBS = $(shell pkg-config --libs libconfuse) 
11+#CONF_CFLAGS = $(shell pkg-config --cflags libconfuse) 
12+#CONF_LIBS = $(shell pkg-config --libs libconfuse) 
13  
14-CFLAGS = -Wall -O3 -march=athlon-xp $(CONF_CFLAGS) -ffast-math 
15+CFLAGS?= -Wall -O3 -march=athlon-xp $(CONF_CFLAGS) -ffast-math 
16 #CFLAGS = -Wall -g -march=athlon-xp $(CONF_CFLAGS) -pg 
17 #CFLAGS = -Wall -g -march=athlon-xp $(CONF_CFLAGS) -DDEBUG 
18  
19 #CFLAGS = -Wall -g -march=athlon-xp $(CONF_FLAGS) -ffast-math -O2 
20  
21 #LDFLAGS = $(CONF_LIBS) -lpng -pg 
22-LDFLAGS = $(CONF_LIBS) -lpng 
23+LDADD = `pkg-config --libs libpng` `pkg-config --libs libconfuse` -lm 
24  
25 all: nelma-cap decompose nelma-drc 
26  
27-%.o: %.c 
28- $(CC) $(CFLAGS) $(INCS) -c $< -o $@ 
29+.c.o: 
30+ $(CC) $(CFLAGS) `pkg-config --cflags libpng` `pkg-config --cflags libconfuse` $(INCS) -c $< -o $@ 
31  
32 nelma-cap: $(NELMA_CAP_OBJS) 
33- $(CC) $^ -o $@ $(LDFLAGS)  
34+ $(CC) $(NELMA_CAP_OBJS) -o $@ $(LDFLAGS) $(LDADD) 
35  
36 nelma-drc: $(NELMA_DRC_OBJS) 
37- $(CC) $^ -o $@ $(LDFLAGS)  
38+ $(CC) $(NELMA_DRC_OBJS) -o $@ $(LDFLAGS) $(LDADD) 
39  
40 decompose: $(DECOMPOSE_OBJS) 
41- $(CC) $^ -o $@ $(LDFLAGS)  
42+ $(CC) $(DECOMPOSE_OBJS) -o $@ $(LDFLAGS) $(LDADD) 
43  
44 clean:  
45 rm -f $(NELMA_CAP_OBJS) 
46@@ -58,8 +58,9 @@ clean:  
47 rm -f nelma-cap 
48 rm -f nelma-drc 
49  
50+INSTALL_PROGRAM?= install 
51 install: all 8 install: all
52- install nelma-cap $(PREFIX)/bin 9- $(INSTALL_PROGRAM) nelma-cap $(PREFIX)/bin
53- install nelma-drc $(PREFIX)/bin 10- $(INSTALL_PROGRAM) nelma-drc $(PREFIX)/bin
54+ $(BSD_INSTALL_PROGRAM) nelma-cap ${DESTDIR}$(PREFIX)/bin 11+ $(INSTALL_PROGRAM) nelma-cap $(DESTDIR)$(PREFIX)/bin
55+ $(BSD_INSTALL_PROGRAM) nelma-drc ${DESTDIR}$(PREFIX)/bin 12+ $(INSTALL_PROGRAM) nelma-drc $(DESTDIR)$(PREFIX)/bin
56  13
57 .PHONY: all clean install 14 .PHONY: all clean install
File Deleted: pkgsrc/cad/nelma/patches/Attic/patch-ac