diff options
| author | dmcmahill <dmcmahill> | 2007-03-02 12:20:47 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2007-03-02 12:20:47 +0000 |
| commit | b26782a8b1f3017b609dacdd934b74e75da4b1ee (patch) | |
| tree | 3d7a8a34ab546ff47addfc77b057bb969c6ce779 /cad/nelma | |
| parent | ef923f4426b81b3ad31ec6334262f2fbcc3c46ed (diff) | |
| download | pkgsrc-b26782a8b1f3017b609dacdd934b74e75da4b1ee.tar.gz | |
- don't overwrite LDFLAGS but rather append the stuff we need.
- add missing -lm (how did this work before?)
- remove one last GNU make-ism since there is a portable way of doing
it
Diffstat (limited to 'cad/nelma')
| -rw-r--r-- | cad/nelma/Makefile | 3 | ||||
| -rw-r--r-- | cad/nelma/distinfo | 4 | ||||
| -rw-r--r-- | cad/nelma/patches/patch-ab | 17 |
3 files changed, 13 insertions, 11 deletions
diff --git a/cad/nelma/Makefile b/cad/nelma/Makefile index 19f52c5b341..4285cc00219 100644 --- a/cad/nelma/Makefile +++ b/cad/nelma/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/03/02 01:59:47 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2 2007/03/02 12:20:47 dmcmahill Exp $ # DISTNAME= nelma-3.0 +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/ diff --git a/cad/nelma/distinfo b/cad/nelma/distinfo index 983b7de0f2b..49c24d83526 100644 --- a/cad/nelma/distinfo +++ b/cad/nelma/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/03/02 01:59:47 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2 2007/03/02 12:20:47 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) = 0fdc453940b3cdba4383fcc769e81440826be265 -SHA1 (patch-ab) = 14cb44ff5bc9dbdda29dd97d5659cdeb4662de0c +SHA1 (patch-ab) = 0a4982a283e959210d94db7595e20610721b60a9 diff --git a/cad/nelma/patches/patch-ab b/cad/nelma/patches/patch-ab index 6d7980577ea..e8b0e2d1f39 100644 --- a/cad/nelma/patches/patch-ab +++ b/cad/nelma/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/03/02 01:59:48 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2007/03/02 12:20:47 dmcmahill Exp $ ---- src/Makefile.orig 2006-12-10 18:10:30.000000000 +0000 +--- src/Makefile.orig 2006-12-10 13:10:30.000000000 -0500 +++ src/Makefile @@ -25,31 +25,31 @@ DECOMPOSE_OBJS = pngutil.o \ error.o \ @@ -20,25 +20,26 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/03/02 01:59:48 dmcmahill Exp $ #LDFLAGS = $(CONF_LIBS) -lpng -pg -LDFLAGS = $(CONF_LIBS) -lpng -+LDFLAGS = `pkg-config --libs libconfuse` -lpng ++LDADD = `pkg-config --libs libpng` `pkg-config --libs libconfuse` -lpng -lm all: nelma-cap decompose nelma-drc - %.o: %.c +-%.o: %.c - $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -+ $(CC) $(CFLAGS) `pkg-config --cflags libconfuse` $(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) ++ $(CC) $(NELMA_CAP_OBJS) -o $@ $(LDFLAGS) $(LDADD) nelma-drc: $(NELMA_DRC_OBJS) - $(CC) $^ -o $@ $(LDFLAGS) -+ $(CC) $(NELMA_DRC_OBJS) -o $@ $(LDFLAGS) ++ $(CC) $(NELMA_DRC_OBJS) -o $@ $(LDFLAGS) $(LDADD) decompose: $(DECOMPOSE_OBJS) - $(CC) $^ -o $@ $(LDFLAGS) -+ $(CC) $(DECOMPOSE_OBJS) -o $@ $(LDFLAGS) ++ $(CC) $(DECOMPOSE_OBJS) -o $@ $(LDFLAGS) $(LDADD) clean: rm -f $(NELMA_CAP_OBJS) |