[pkgsrc/trunk]: pkgsrc/graphics Now that PR 24378 has been fixed, take the ha...

[garbled <garbled%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/130519b595c1
branches:  trunk
changeset: 468173:130519b595c1
user:      garbled <garbled%pkgsrc.org@localhost>
date:      Wed Feb 11 01:32:06 2004 +0000

description:
Now that PR 24378 has been fixed, take the hack out of Makefile.common so
these packages build the way they were intended to.

diffstat:

 graphics/cal3d-examples/Makefile |  6 ++++--
 graphics/cal3d/Makefile.common   |  4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r f099fe229d57 -r 130519b595c1 graphics/cal3d-examples/Makefile
--- a/graphics/cal3d-examples/Makefile  Wed Feb 11 01:23:36 2004 +0000
+++ b/graphics/cal3d-examples/Makefile  Wed Feb 11 01:32:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/10 09:15:39 garbled Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/11 01:32:06 garbled Exp $
 #
 
 PKGNAME=               cal3d-examples-${CAL3D_VERSION}
@@ -10,6 +10,7 @@
 
 COMMENT=               Tools and demos for cal3d library
 
+USE_X11=               YES
 USE_BUILDLINK3=                yes
 CONFIGURE_ARGS+=       --with-cal3d=${PREFIX}
 CONFIGURE_ARGS+=       --with-glut=${PREFIX}
@@ -17,7 +18,8 @@
                        ${WRKSRC}/examples/miniviewer_gl \
                        ${WRKSRC}/tools/converter
 CFLAGS+=               -DCAL3D_DATADIR='\"${DATADIR}/\"'
-LIBS+=                 -lm -lX11 -lXi -lGL -lGLU -lXmu
+LDFLAGS+=              -L${X11BASE}/lib
+LIBS+=                 -lm -lGL -lX11 -lGLU -lXi -lXmu
 BUILD_DIRS=            ${WRKSRC}/examples/cally \
                        ${WRKSRC}/examples/miniviewer_gl \
                        ${WRKSRC}/tools/converter
diff -r f099fe229d57 -r 130519b595c1 graphics/cal3d/Makefile.common
--- a/graphics/cal3d/Makefile.common    Wed Feb 11 01:23:36 2004 +0000
+++ b/graphics/cal3d/Makefile.common    Wed Feb 11 01:32:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/02/11 01:32:06 garbled Exp $
 #
 
 DISTNAME=              cal3d-${CAL3D_VERSION}
@@ -16,7 +16,7 @@
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 AUTOMAKE_REQD=         1.8
-AUTOMAKE_OVERRIDE=     NO
+#AUTOMAKE_OVERRIDE=    NO
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 
 .include "../../mk/autoconf.mk"