From b5bbe712ddedae2f12ecabd8296df14452a035ee Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 21 Jun 2000 02:58:23 +0000 Subject: USE_LIBTOOL instead of PKGLIBTOOL. --- x11/gtkglarea/Makefile | 34 ++++++++++++++++++---------------- x11/gtkglarea/files/patch-sum | 4 ++-- x11/gtkglarea/patches/patch-aa | 30 +++++++----------------------- x11/gtkglarea/pkg/PLIST | 5 +++-- 4 files changed, 30 insertions(+), 43 deletions(-) (limited to 'x11/gtkglarea') diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile index 56eeb542047..4065fd51dbc 100644 --- a/x11/gtkglarea/Makefile +++ b/x11/gtkglarea/Makefile @@ -1,23 +1,25 @@ -# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:46 rh Exp $ +# $NetBSD: Makefile,v 1.14 2000/06/21 03:20:33 jlam Exp $ -DISTNAME= gtkglarea-1.2.1 -CATEGORIES= x11 graphics -MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/ +DISTNAME= gtkglarea-1.2.1 +CATEGORIES= x11 graphics +MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/ -MAINTAINER= hubertf@netbsd.org -HOMEPAGE= http://www.student.oulu.fi/~jlof/gtkglarea/ +MAINTAINER= hubertf@netbsd.org +HOMEPAGE= http://www.student.oulu.fi/~jlof/gtkglarea/ -DEPENDS+= Mesa-*:../../graphics/Mesa -DEPENDS+= gtk+-1.2.*:../../x11/gtk +DEPENDS+= Mesa-*:../../graphics/Mesa +DEPENDS+= gtk+-1.2.*:../../x11/gtk -GNU_CONFIGURE= yes -USE_PKGLIBTOOL= yes -USE_X11BASE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} -CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE} -CONFIGURE_ARGS+= --with-lib-MesaGL +USE_X11BASE= # defined +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -PLIST_SUBST+= LOCALBASE=${LOCALBASE} +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} +CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE} +CONFIGURE_ARGS+= --with-lib-MesaGL + +PLIST_SUBST+= LOCALBASE=${LOCALBASE} post-install: ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/gtkglarea @@ -27,6 +29,6 @@ post-install: ${INSTALL_MAN} gtkglarea.txt ${PREFIX}/share/doc/gtkglarea ${TEST} ${PREFIX} = ${LOCALBASE} || \ ${LN} -fs ${PREFIX}/share/aclocal/gtkgl.m4 \ - ${LOCALBASE}/share/aclocal/gtkgl.m4 + ${LOCALBASE}/share/aclocal/gtkgl.m4 .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtkglarea/files/patch-sum b/x11/gtkglarea/files/patch-sum index bfac2ec17a7..8476867968c 100644 --- a/x11/gtkglarea/files/patch-sum +++ b/x11/gtkglarea/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.3 2000/04/05 20:46:13 tron Exp $ +$NetBSD: patch-sum,v 1.4 2000/06/21 03:20:34 jlam Exp $ -MD5 (patch-aa) = c03b99e68f99994a421911a364843731 +MD5 (patch-aa) = a34030686a9eea0d645bf5459e8ce8de diff --git a/x11/gtkglarea/patches/patch-aa b/x11/gtkglarea/patches/patch-aa index 5ec84418155..d0abb6b899f 100644 --- a/x11/gtkglarea/patches/patch-aa +++ b/x11/gtkglarea/patches/patch-aa @@ -1,24 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2000/04/05 20:46:14 tron Exp $ +$NetBSD: patch-aa,v 1.4 2000/06/21 03:20:34 jlam Exp $ ---- configure.orig Thu Feb 25 20:29:00 1999 -+++ configure Wed Apr 5 22:43:57 2000 -@@ -1620,6 +1620,7 @@ - fi - - # Always use our own libtool. -+if false; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - # Check for any special flags to pass to ltconfig. -@@ -1851,6 +1852,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. -@@ -2241,7 +2243,7 @@ +--- configure.orig Thu Feb 25 14:29:00 1999 ++++ configure Tue Jun 20 23:12:13 2000 +@@ -2241,7 +2241,7 @@ echo $ac_n "checking Mesa""... $ac_c" 1>&6 echo "configure:2244: checking Mesa" >&5 @@ -27,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2000/04/05 20:46:14 tron Exp $ cat > conftest.$ac_ext <&6 echo "configure:2268: checking Mesa with pthreads" >&5 @@ -36,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2000/04/05 20:46:14 tron Exp $ cat > conftest.$ac_ext <&2; exit 1; } fi -@@ -2313,9 +2315,9 @@ +@@ -2313,9 +2313,9 @@ if test "x$have_GL" = "xyes"; then GL_LIBS="$GL_LDOPTS -lGLU -lGL" elif test "x$have_MesaGL" = "xyes"; then diff --git a/x11/gtkglarea/pkg/PLIST b/x11/gtkglarea/pkg/PLIST index 94c6e4576d0..923358969aa 100644 --- a/x11/gtkglarea/pkg/PLIST +++ b/x11/gtkglarea/pkg/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 1999/10/23 00:00:55 tron Exp $ +@comment $NetBSD: PLIST,v 1.5 2000/06/21 03:20:34 jlam Exp $ include/gtkgl/gdkgl.h include/gtkgl/gtkglarea.h @dirrm include/gtkgl -lib/libgtkgl.so.4.0 lib/libgtkgl.a +lib/libgtkgl.la +lib/libgtkgl.so.4.0 share/aclocal/gtkgl.m4 share/doc/gtkglarea/HOWTO.txt share/doc/gtkglarea/gdkgl.txt -- cgit v1.2.3