diff options
| -rw-r--r-- | graphics/Ngraph/Makefile | 13 | ||||
| -rw-r--r-- | graphics/Ngraph/distinfo | 4 | ||||
| -rw-r--r-- | graphics/Ngraph/patches/patch-aa | 33 |
3 files changed, 26 insertions, 24 deletions
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile index 82428c0b73e..de6951bce6f 100644 --- a/graphics/Ngraph/Makefile +++ b/graphics/Ngraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:15 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/09/12 03:06:04 jlam Exp $ # DISTNAME= Ngraph-6.3.06-src @@ -15,9 +15,8 @@ COMMENT= the 2D graph and data analysis program EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_GMAKE= yes -USE_MOTIF= yes -MAKE_ENV+= MOTIF_DEFS="${MOTIF_DEFS}" GMAKE="${GMAKE}" +USE_BUILDLINK_ONLY= yes +USE_GMAKE= yes post-extract: ${GTAR} -C ${WRKSRC}/combo -xzf ${DISTDIR}/ileaf-widgets.tar.Z @@ -25,8 +24,6 @@ post-extract: post-install: ${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3-doc.tar.gz +.include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" - -.if !defined(IS_LESSTIF) || (${IS_LESSTIF} != "0") -MOTIF_DEFS= -DMOTIF12 -.endif diff --git a/graphics/Ngraph/distinfo b/graphics/Ngraph/distinfo index 572d1de166f..61baaba1373 100644 --- a/graphics/Ngraph/distinfo +++ b/graphics/Ngraph/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:07 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/09/12 03:06:04 jlam Exp $ SHA1 (Ngraph-6.3.06-src.tar.gz) = bea0e06300c37a69e7a084f0713e973dd806c458 Size (Ngraph-6.3.06-src.tar.gz) = 364733 bytes @@ -6,5 +6,5 @@ SHA1 (Ngraph-6.3-doc.tar.gz) = d1024e53d01cca2e4cd00a5d8a53dc618c4e9fc1 Size (Ngraph-6.3-doc.tar.gz) = 556956 bytes SHA1 (ileaf-widgets.tar.Z) = db0f6425f77bc3013b7aae163be558683661560e Size (ileaf-widgets.tar.Z) = 70223 bytes -SHA1 (patch-aa) = b821cfdfe264f234ac0a30a327494b9e42936b65 +SHA1 (patch-aa) = cdb8d7446ebcae962890e240e48549cc60548a96 SHA1 (patch-ab) = 194dbb122c85c6c0cad999496388f8cd9e22c238 diff --git a/graphics/Ngraph/patches/patch-aa b/graphics/Ngraph/patches/patch-aa index 8e54a15ac37..291e68eeb51 100644 --- a/graphics/Ngraph/patches/patch-aa +++ b/graphics/Ngraph/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/25 08:17:15 sakamoto Exp $ +$NetBSD: patch-aa,v 1.2 2001/09/12 03:06:04 jlam Exp $ ---- Makefile.orig Sat Oct 16 19:00:08 1999 -+++ Makefile Thu Nov 25 11:02:25 1999 -@@ -2,25 +2,42 @@ +--- Makefile.orig Sat Oct 16 06:00:08 1999 ++++ Makefile +@@ -1,27 +1,43 @@ + # MAINVERSION = '"6.03"' GUIVERSION = '".06"' -LIBDIR = '"/usr/local/lib/Ngraph"' @@ -16,23 +17,22 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/25 08:17:15 sakamoto Exp $ ############################################################################### # -# Linux + Motif 2.1 (RedHat) [static link] -+# NetBSD + lesstif [static link] ++# NetBSD + lesstif/openmotif [dynamic link] # CC = gcc -CCOPTION = -O2 -m486 -MAKE = make -+CCOPTION = -O2 -+MAKE = ${GMAKE} ++CCOPTION = ${CFLAGS} AR = ar RANLIB = ranlib STRIP = strip -DEFS = -DJAPANESE -PLATFORM = '"for X11 [Linux(glibc2)+Motif2.1]"' +DEFS = ${MOTIF_DEFS} -+PLATFORM = '"for X11 [NetBSD + LessTif]"' -+X11INCLUDE = -I${X11BASE}/include -I../combo -+STATICLINK = ./combo/ComboBox.o ${X11BASE}/lib/libXm.a -+X11LIB = ${LDFLAGS} -lm -lXext -lXt -lXp -lX11 -lICE -lSM ++PLATFORM = '"for X11 [NetBSD + OpenMotif/LessTif]"' ++X11INCLUDE = -I${BUILDLINK_X11_DIR}/include -I../combo ++STATICLINK = ./combo/ComboBox.o ++X11LIB = ${LDFLAGS} ${MOTIFLIB} -lm -lXext -lXt -lXp -lX11 -lICE -lSM +# +# +############################################################################### @@ -56,15 +56,20 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/25 08:17:15 sakamoto Exp $ +#X11LIB = -L/usr/X11R6/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM # # -@@ -155,4 +172,5 @@ + ############################################################################### +@@ -154,6 +170,7 @@ + OBJECT = x11/main.o x11/x11.a src/kern.a all: -+ (cd combo; $(CC) -c $(X11INCLUDE) ComboBox.c) ++ (cd combo; $(CC) $(CCOPTION) $(X11INCLUDE) -c ComboBox.c) (cd src; $(MAKE) kern.a) (cd x11; $(MAKE) main.o) -@@ -197,4 +215,5 @@ + (cd x11; $(MAKE) x11.a) +@@ -196,6 +213,7 @@ + - (cd x11; $(MAKE) clean) - (cd x11drive; $(MAKE) clean) - (cd x11addin; $(MAKE) clean) + - (cd combo; rm ComboBox.o) cleanbackup: + rm *~ src/*~ x11/*~ x11drive/*~ |