diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2010-08-04 02:46:03 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2010-08-04 02:46:03 +0000 |
commit | 48d0215093963cd6ed6688a92c6a3b592f7c40ad (patch) | |
tree | d5c8de3f48b28b3f693d48fb65abbc7b074df0c6 /cad | |
parent | fa51dbd521632fa55f52ac2198c676084ab0f916 (diff) | |
download | pkgsrc-48d0215093963cd6ed6688a92c6a3b592f7c40ad.tar.gz |
Update to nelma-3.2.
Changes are:
Make nelma compile with libpng-1.4.x (thanks to Thomas Klausner)
Minor Makefile fixes.
Diffstat (limited to 'cad')
-rw-r--r-- | cad/nelma/Makefile | 5 | ||||
-rw-r--r-- | cad/nelma/distinfo | 13 | ||||
-rw-r--r-- | cad/nelma/patches/patch-aa | 38 | ||||
-rw-r--r-- | cad/nelma/patches/patch-ab | 59 | ||||
-rw-r--r-- | cad/nelma/patches/patch-ac | 49 |
5 files changed, 24 insertions, 140 deletions
diff --git a/cad/nelma/Makefile b/cad/nelma/Makefile index 9854000f7b7..92c4edd0d25 100644 --- a/cad/nelma/Makefile +++ b/cad/nelma/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:55 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/08/04 02:46:03 dmcmahill Exp $ # -DISTNAME= nelma-3.0 -PKGREVISION= 2 +DISTNAME= nelma-3.2 CATEGORIES= cad MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/ diff --git a/cad/nelma/distinfo b/cad/nelma/distinfo index 59ea714ceb5..1c0c25c92b8 100644 --- a/cad/nelma/distinfo +++ b/cad/nelma/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.5 2010/06/13 22:43:55 wiz Exp $ +$NetBSD: distinfo,v 1.6 2010/08/04 02:46:03 dmcmahill Exp $ -SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c -RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad -Size (nelma-3.0.tar.gz) = 64078 bytes -SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714 -SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0 -SHA1 (patch-ac) = 5585eed126e7bd3133cb412aaf191a7c363dcc1c +SHA1 (nelma-3.2.tar.gz) = 2a39a35527db03babcb09e992b29cbc659923c71 +RMD160 (nelma-3.2.tar.gz) = 657decc5243147bdb6d80329a0604d76ddd0a91d +Size (nelma-3.2.tar.gz) = 64618 bytes +SHA1 (patch-aa) = 284395f49ca448aebaace06673fc1d14f325112c +SHA1 (patch-ab) = 48eb0c1b1c8c6f0848d98cf1cdc7ab3126722fe0 diff --git a/cad/nelma/patches/patch-aa b/cad/nelma/patches/patch-aa index 407009d6ee3..334aa5552b9 100644 --- a/cad/nelma/patches/patch-aa +++ b/cad/nelma/patches/patch-aa @@ -1,37 +1,15 @@ -$NetBSD: patch-aa,v 1.2 2010/01/28 19:27:03 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2010/08/04 02:46:03 dmcmahill Exp $ ---- Makefile.orig 2006-12-10 18:14:29.000000000 +0000 +--- Makefile.orig 2007-03-04 19:29:14.000000000 +0000 +++ Makefile -@@ -1,18 +1,20 @@ --export PREFIX = $(HOME)/software -+PREFIX?= $(HOME)/software +@@ -13,8 +13,8 @@ nelma-install: + INSTALL_MAN?= install --all: nelma doxygen -+all: nelma - - install: nelma-install man-install - - nelma: -- $(MAKE) -C src all -+ cd src && $(MAKE) PREFIX=$(PREFIX) all - - nelma-install: -- $(MAKE) -C src install -+ cd src && $(MAKE) PREFIX=$(PREFIX) install - -+INSTALL?= install -+INSTALL_MAN?= install man-install: -- install doc/nelma-cap.1 $(PREFIX)/man/man1 -- install doc/nelma-drc.1 $(PREFIX)/man/man1 -+ $(BSD_INSTALL_MAN) doc/nelma-cap.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 -+ $(BSD_INSTALL_MAN) doc/nelma-drc.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 +- $(INSTALL_MAN) doc/nelma-cap.1 $(PREFIX)/man/man1 +- $(INSTALL_MAN) doc/nelma-drc.1 $(PREFIX)/man/man1 ++ $(INSTALL_MAN) doc/nelma-cap.1 $(DESTDIR)$(PREFIX)/man/man1 ++ $(INSTALL_MAN) doc/nelma-drc.1 $(DESTDIR)$(PREFIX)/man/man1 doxygen: doxygen -@@ -21,4 +23,4 @@ clean: - rm -rf doc/html - $(MAKE) -C src clean - --.PHONY: all clean -+.PHONY: all clean doxygen install man-install nelma nelma-install diff --git a/cad/nelma/patches/patch-ab b/cad/nelma/patches/patch-ab index 0279d0eca84..154bf0a23c5 100644 --- a/cad/nelma/patches/patch-ab +++ b/cad/nelma/patches/patch-ab @@ -1,57 +1,14 @@ -$NetBSD: patch-ab,v 1.4 2010/01/28 19:27:03 joerg Exp $ +$NetBSD: patch-ab,v 1.5 2010/08/04 02:46:03 dmcmahill Exp $ ---- src/Makefile.orig 2006-12-10 13:10:30.000000000 -0500 +--- src/Makefile.orig 2010-07-05 19:20:28.000000000 +0000 +++ src/Makefile -@@ -25,31 +25,31 @@ DECOMPOSE_OBJS = pngutil.o \ - error.o \ - decompose.o +@@ -61,7 +61,7 @@ clean: + INSTALL_PROGRAM?= install --CONF_CFLAGS = $(shell pkg-config --cflags libconfuse) --CONF_LIBS = $(shell pkg-config --libs libconfuse) -+#CONF_CFLAGS = $(shell pkg-config --cflags libconfuse) -+#CONF_LIBS = $(shell pkg-config --libs libconfuse) - --CFLAGS = -Wall -O3 -march=athlon-xp $(CONF_CFLAGS) -ffast-math -+CFLAGS?= -Wall -O3 -march=athlon-xp $(CONF_CFLAGS) -ffast-math - #CFLAGS = -Wall -g -march=athlon-xp $(CONF_CFLAGS) -pg - #CFLAGS = -Wall -g -march=athlon-xp $(CONF_CFLAGS) -DDEBUG - - #CFLAGS = -Wall -g -march=athlon-xp $(CONF_FLAGS) -ffast-math -O2 - - #LDFLAGS = $(CONF_LIBS) -lpng -pg --LDFLAGS = $(CONF_LIBS) -lpng -+LDADD = `pkg-config --libs libpng` `pkg-config --libs libconfuse` -lm - - all: nelma-cap decompose nelma-drc - --%.o: %.c -- $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -+.c.o: -+ $(CC) $(CFLAGS) `pkg-config --cflags libpng` `pkg-config --cflags libconfuse` $(INCS) -c $< -o $@ - - nelma-cap: $(NELMA_CAP_OBJS) -- $(CC) $^ -o $@ $(LDFLAGS) -+ $(CC) $(NELMA_CAP_OBJS) -o $@ $(LDFLAGS) $(LDADD) - - nelma-drc: $(NELMA_DRC_OBJS) -- $(CC) $^ -o $@ $(LDFLAGS) -+ $(CC) $(NELMA_DRC_OBJS) -o $@ $(LDFLAGS) $(LDADD) - - decompose: $(DECOMPOSE_OBJS) -- $(CC) $^ -o $@ $(LDFLAGS) -+ $(CC) $(DECOMPOSE_OBJS) -o $@ $(LDFLAGS) $(LDADD) - - clean: - rm -f $(NELMA_CAP_OBJS) -@@ -58,8 +58,9 @@ clean: - rm -f nelma-cap - rm -f nelma-drc - -+INSTALL_PROGRAM?= install install: all -- install nelma-cap $(PREFIX)/bin -- install nelma-drc $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) nelma-cap ${DESTDIR}$(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) nelma-drc ${DESTDIR}$(PREFIX)/bin +- $(INSTALL_PROGRAM) nelma-cap $(PREFIX)/bin +- $(INSTALL_PROGRAM) nelma-drc $(PREFIX)/bin ++ $(INSTALL_PROGRAM) nelma-cap $(DESTDIR)$(PREFIX)/bin ++ $(INSTALL_PROGRAM) nelma-drc $(DESTDIR)$(PREFIX)/bin .PHONY: all clean install diff --git a/cad/nelma/patches/patch-ac b/cad/nelma/patches/patch-ac deleted file mode 100644 index 355ea00208a..00000000000 --- a/cad/nelma/patches/patch-ac +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2010/06/13 22:43:55 wiz Exp $ - ---- src/pngutil.c.orig 2006-12-10 15:50:19.000000000 +0000 -+++ src/pngutil.c -@@ -145,7 +145,7 @@ int png_read(struct image **dest, char * - { - error("Can't allocate memory"); - fclose(fp); -- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, NULL, NULL); - return -1; - } - -@@ -159,7 +159,7 @@ int png_read(struct image **dest, char * - error("libpng error"); - /* Free all of the memory associated with the png_ptr and - * info_ptr */ -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - /* If we get here, we had a problem reading the file */ - return -1; -@@ -185,7 +185,7 @@ int png_read(struct image **dest, char * - PNG_TRANSFORM_PACKING | - PNG_TRANSFORM_EXPAND; - -- png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL); -+ png_read_png(png_ptr, info_ptr, png_transforms, NULL); - - /* At this point you have read the entire image */ - img=png_alloc( png_get_image_width(png_ptr, info_ptr), -@@ -209,7 +209,7 @@ int png_read(struct image **dest, char * - *dest=img; - - /* Clean up after the read, and free any memory allocated - REQUIRED */ -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - - /* close the file */ - fclose(fp); -@@ -253,7 +253,7 @@ int png_write(struct image *img, char *f - if (info_ptr == NULL) { - error("Can't allocate memory"); - fclose(fp); -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - return -1; - } - |