diff options
| author | jlam <jlam> | 2001-09-12 03:06:04 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-09-12 03:06:04 +0000 |
| commit | 2a2d98d2a1f94e73f8ef82aab4575599302bc9aa (patch) | |
| tree | a58c369c6e321c8f7b20d815fc18ee349109d131 /graphics/Ngraph/patches | |
| parent | 5af971b8c5751eb98828dd6d861bd61eb0f32054 (diff) | |
| download | pkgsrc-2a2d98d2a1f94e73f8ef82aab4575599302bc9aa.tar.gz | |
* Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.
* Use dynamic Motif-compatible libraries instead of linking against the
static one.
Diffstat (limited to 'graphics/Ngraph/patches')
| -rw-r--r-- | graphics/Ngraph/patches/patch-aa | 33 |
1 files changed, 19 insertions, 14 deletions
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/*~ |