summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gtkglarea/Makefile34
-rw-r--r--x11/gtkglarea/files/patch-sum4
-rw-r--r--x11/gtkglarea/patches/patch-aa30
-rw-r--r--x11/gtkglarea/pkg/PLIST5
-rw-r--r--x11/gtkstep/Makefile23
-rw-r--r--x11/gtkstep/files/patch-sum7
-rw-r--r--x11/gtkstep/patches/patch-aa20
-rw-r--r--x11/gtkstep/pkg/PLIST3
8 files changed, 49 insertions, 77 deletions
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 <<EOF
#line 2247 "configure"
#include "confdefs.h"
-@@ -2265,7 +2267,7 @@
+@@ -2265,7 +2265,7 @@
if test "x$have_MesaGL" = "xno"; then
echo $ac_n "checking Mesa with pthreads""... $ac_c" 1>&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 <<EOF
#line 2271 "configure"
#include "confdefs.h"
-@@ -2301,9 +2303,9 @@
+@@ -2301,9 +2301,9 @@
elif test "x$with_lib_MesaGL" = "xyes"; then
if test "x$have_MesaGL" = "xyes"; then
@@ -48,7 +32,7 @@ $NetBSD: patch-aa,v 1.3 2000/04/05 20:46:14 tron Exp $
else
{ echo "configure: error: Missing MesaGL library" 1>&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
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index 210e334da5b..32377a12501 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:46 rh Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/21 03:04:36 jlam Exp $
-DISTNAME= gtkstep-1.10
-CATEGORIES= x11
-MASTER_SITES= http://ulli.linuxave.net/gtkstep/
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= gtkstep-1.10
+CATEGORIES= x11
+MASTER_SITES= http://ulli.linuxave.net/gtkstep/
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://ulli.linuxave.net/gtkstep/index.html
+MAINTAINER= jlam@netbsd.org
+HOMEPAGE= http://ulli.linuxave.net/gtkstep/index.html
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+-1.2.*:../../x11/gtk
-GNU_CONFIGURE= yes
-USE_PKGLIBTOOL= yes
-USE_X11BASE= yes
+GNU_CONFIGURE= # defined
+USE_X11BASE= # defined
+USE_LIBTOOL= # defined
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
post-install:
${RM} -f ${PREFIX}/share/themes/Step/gtk/gtkrc.in
diff --git a/x11/gtkstep/files/patch-sum b/x11/gtkstep/files/patch-sum
index cc76b45aab2..8e9272c47b2 100644
--- a/x11/gtkstep/files/patch-sum
+++ b/x11/gtkstep/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/10/08 21:21:26 jlam Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/21 03:04:37 jlam Exp $
-MD5 (patch-aa) = bed7714aa161fcfabfc69a51401ab5de
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/x11/gtkstep/patches/patch-aa b/x11/gtkstep/patches/patch-aa
deleted file mode 100644
index a59bae5f55e..00000000000
--- a/x11/gtkstep/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/10/08 21:21:26 jlam Exp $
-
---- ./configure.orig Mon Sep 13 11:54:47 1999
-+++ ./configure Wed Oct 6 21:58:22 1999
-@@ -1479,6 +1479,7 @@
- fi
-
-
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1636,6 +1637,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+fi
-
-
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
diff --git a/x11/gtkstep/pkg/PLIST b/x11/gtkstep/pkg/PLIST
index b1695285fdd..9f8609f2cae 100644
--- a/x11/gtkstep/pkg/PLIST
+++ b/x11/gtkstep/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 1999/11/20 13:41:55 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/06/21 03:04:38 jlam Exp $
lib/gtk/themes/engines/libstep.a
+lib/gtk/themes/engines/libstep.la
lib/gtk/themes/engines/libstep.so.0.0
share/themes/Step/ICON.png
share/themes/Step/README.html
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-20 21:21:59 +0000