diff options
| author | fredb <fredb@pkgsrc.org> | 2002-04-17 04:45:06 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2002-04-17 04:45:06 +0000 |
| commit | 9807afcb602d970ee86027a46a72552f83b0c0c3 (patch) | |
| tree | dc783e63ef8448e3a620be967f9233cff8ff8e71 /cad | |
| parent | 6a1cfa23665b0a3668d7753fb1d0c41cfb290b90 (diff) | |
| download | pkgsrc-9807afcb602d970ee86027a46a72552f83b0c0c3.tar.gz | |
Update dependency on xforms. We're mainly bumping the dependency
and package revision, since we may now link against the forms shared
library, and because we also have to add a dependency on jpeg lib.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/xchiplogo/Makefile | 6 | ||||
| -rw-r--r-- | cad/xchiplogo/distinfo | 4 | ||||
| -rw-r--r-- | cad/xchiplogo/patches/patch-aa | 16 |
3 files changed, 16 insertions, 10 deletions
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile index 0b040a047bb..b7acb78533b 100644 --- a/cad/xchiplogo/Makefile +++ b/cad/xchiplogo/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:47 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/04/17 04:45:08 fredb Exp $ # DISTNAME= xchiplogo PKGNAME= xchiplogo-19991222 +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.eleceng.adelaide.edu.au/Personal/moini/ @@ -10,7 +11,8 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.eleceng.adelaide.edu.au/Personal/moini/chiplogo.html COMMENT= Program for generating pretty logos on VLSI chips -DEPENDS+= xforms-[0-9]*:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms USE_X11= YES USE_XPM= YES diff --git a/cad/xchiplogo/distinfo b/cad/xchiplogo/distinfo index dd5a2a3b5cd..1a465b64e70 100644 --- a/cad/xchiplogo/distinfo +++ b/cad/xchiplogo/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 16:27:03 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/17 04:45:08 fredb Exp $ SHA1 (xchiplogo.tar.gz) = 2884f2375a389aa5427efecef7d8cf3e74974d98 Size (xchiplogo.tar.gz) = 46652 bytes -SHA1 (patch-aa) = 4b001740468c1559c8c88812ea252b42c136193f +SHA1 (patch-aa) = 1235622f36c63bdeb5e453ac4fa1bce9bb6ec9c1 diff --git a/cad/xchiplogo/patches/patch-aa b/cad/xchiplogo/patches/patch-aa index 90383615be1..9b7bde10b46 100644 --- a/cad/xchiplogo/patches/patch-aa +++ b/cad/xchiplogo/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:57:12 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2002/04/17 04:45:08 fredb Exp $ ---- Makefile.orig Sun Nov 17 17:43:29 1996 -+++ Makefile Wed Dec 22 20:05:59 1999 -@@ -4,24 +4,21 @@ +--- Makefile.orig Sun Nov 17 16:43:29 1996 ++++ Makefile +@@ -3,27 +3,24 @@ + # then all you need is to type make and let it go # -CC= gcc @@ -16,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:57:12 dmcmahill Exp $ -XFORMSINC=-I/usr/local/X11/include -XFORMSLIB=-L/usr/local/X11/lib +XFORMSINC=-I${X11BASE}/include -+XFORMSLIB=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib ++XFORMSLIB=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib # SYSLIB=-lXpm -lX11 -lm @@ -29,7 +30,10 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:57:12 dmcmahill Exp $ -CFLAGS=$(CCFLAG) $(XFORMSINC) $(XINCLUDE) -LDFLAGS = $(LDFLAG) +-LIBS=$(XFORMSLIB) -lforms $(SYSLIB) +CFLAGS+= $(XFORMSINC) $(XINCLUDE) +LDFLAGS+= $(LDFLAG) - LIBS=$(XFORMSLIB) -lforms $(SYSLIB) ++LIBS=$(XFORMSLIB) -lforms -ljpeg $(SYSLIB) + # + SRCS = main.c xchiplogo.c help.c |