diff options
-rw-r--r-- | audio/rplay/Makefile | 6 | ||||
-rw-r--r-- | audio/rplay/pkg/PLIST | 3 | ||||
-rw-r--r-- | editors/pico/Makefile | 17 | ||||
-rw-r--r-- | editors/pico/pkg/PLIST | 3 | ||||
-rw-r--r-- | www/libwww/Makefile | 26 | ||||
-rw-r--r-- | www/libwww/files/patch-sum | 3 | ||||
-rw-r--r-- | www/libwww/patches/patch-ab | 29 | ||||
-rw-r--r-- | www/libwww/pkg/PLIST | 25 | ||||
-rw-r--r-- | x11/gtkglarea/Makefile | 34 | ||||
-rw-r--r-- | x11/gtkglarea/files/patch-sum | 4 | ||||
-rw-r--r-- | x11/gtkglarea/patches/patch-aa | 30 | ||||
-rw-r--r-- | x11/gtkglarea/pkg/PLIST | 5 | ||||
-rw-r--r-- | x11/gtkstep/Makefile | 23 | ||||
-rw-r--r-- | x11/gtkstep/files/patch-sum | 7 | ||||
-rw-r--r-- | x11/gtkstep/patches/patch-aa | 20 | ||||
-rw-r--r-- | x11/gtkstep/pkg/PLIST | 3 |
16 files changed, 105 insertions, 133 deletions
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 3f5c2e73995..6bde3c79eec 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/06/01 11:23:14 rh Exp $ +# $NetBSD: Makefile,v 1.18 2000/06/21 03:37:22 jlam Exp $ # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp # @@ -14,8 +14,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf DEPENDS+= gsm-1.0.10:../../audio/gsm DEPENDS+= rx-1.5:../../devel/rx -USE_PKGLIBTOOL= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= # defined +GNU_CONFIGURE= # defined CONFIGURE_ENV+= RPLAY_TARGET=generic # XXX generic, or oss, or sun? CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" diff --git a/audio/rplay/pkg/PLIST b/audio/rplay/pkg/PLIST index 8cf064067d2..566b6e92ffc 100644 --- a/audio/rplay/pkg/PLIST +++ b/audio/rplay/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2000/01/26 22:11:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2000/06/21 03:37:23 jlam Exp $ etc/rc.d/rplayd.sh bin/rplay bin/rptp @@ -16,6 +16,7 @@ info/rplay.info @exec install-info %D/info/librplay.info %D/info/dir @exec install-info %D/info/rplay.info %D/info/dir lib/librplay.a +lib/librplay.la lib/librplay.so.0.0 man/man1/rplay.1 man/man1/rptp.1 diff --git a/editors/pico/Makefile b/editors/pico/Makefile index bb6739a1d61..9891e2001c8 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:25 rh Exp $ +# $NetBSD: Makefile,v 1.20 2000/06/21 03:53:35 jlam Exp $ # DISTNAME= pine4.21 @@ -9,7 +9,15 @@ MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ MAINTAINER= root@garbled.net HOMEPAGE= http://www.washington.edu/pine/ -USE_PKGLIBTOOL= yes +USE_LIBTOOL= # defined + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +BUILDNAME= so5 +.else +BUILDNAME= neb +.endif do-build: cd ${WRKSRC} && ./build ${BUILDNAME} CC="${LIBTOOL} ${CC}" \ @@ -29,8 +37,3 @@ do-install: ${PREFIX}/include/pico/ .include "../../mk/bsd.pkg.mk" -.if ${OPSYS} == "SunOS" -BUILDNAME= so5 -.else -BUILDNAME= neb -.endif diff --git a/editors/pico/pkg/PLIST b/editors/pico/pkg/PLIST index 715e3910141..2640073bf8f 100644 --- a/editors/pico/pkg/PLIST +++ b/editors/pico/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 1999/11/11 17:40:17 tv Exp $ +@comment $NetBSD: PLIST,v 1.11 2000/06/21 03:53:35 jlam Exp $ bin/pico bin/pilot include/pico/ebind.h @@ -12,6 +12,7 @@ include/pico/pico.h include/pico/resource.h @dirrm include/pico lib/libpico.a +lib/libpico.la lib/libpico.so.3.0 man/man1/pico.1 man/man1/pilot.1 diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 5950707720d..479902be592 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,21 +1,23 @@ -# $NetBSD: Makefile,v 1.8 2000/06/01 11:23:43 rh Exp $ +# $NetBSD: Makefile,v 1.9 2000/06/21 02:58:23 jlam Exp $ # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp # -DISTNAME= w3c-${PKGNAME} -PKGNAME= libwww-5.2.8 -CATEGORIES= www devel -MASTER_SITES= http://www.w3.org/Library/Distribution/ +DISTNAME= w3c-${PKGNAME} +PKGNAME= libwww-5.2.8 +CATEGORIES= www devel +MASTER_SITES= http://www.w3.org/Library/Distribution/ -MAINTAINER= tv@netbsd.org -HOMEPAGE= http://www.w3.org/Library/ +MAINTAINER= tv@netbsd.org +HOMEPAGE= http://www.w3.org/Library/ -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_PKGLIBTOOL= yes -CONFIGURE_ARGS= --with-zlib --with-regex --without-x +USE_GMAKE= # defined +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig -DOCDIR= ${PREFIX}/share/doc/libwww +GNU_CONFIGURE= # defined +CONFIGURE_ARGS= --with-zlib --with-regex --without-x + +DOCDIR= ${PREFIX}/share/doc/libwww post-install: @${MKDIR} ${DOCDIR}/User diff --git a/www/libwww/files/patch-sum b/www/libwww/files/patch-sum index 298217cecf3..06ef83b529b 100644 --- a/www/libwww/files/patch-sum +++ b/www/libwww/files/patch-sum @@ -1,7 +1,6 @@ -$NetBSD: patch-sum,v 1.3 1999/10/14 14:11:01 deberg Exp $ +$NetBSD: patch-sum,v 1.4 2000/06/21 02:58:25 jlam Exp $ MD5 (patch-aa) = a519b8eb3c732d53a366d148c3be6ea4 -MD5 (patch-ab) = d816fc47e28af17910ee2bd1555ab642 MD5 (patch-ac) = 248bcfe7e511a021fc96a3d0d311aefa MD5 (patch-ad) = ee66245051e6df813c8594280eece4c3 MD5 (patch-ae) = a9b8a535f0b6bfc40cf2fb6ec908d1d6 diff --git a/www/libwww/patches/patch-ab b/www/libwww/patches/patch-ab deleted file mode 100644 index fd539113877..00000000000 --- a/www/libwww/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.4 1999/10/08 04:43:07 deberg Exp $ - ---- configure.orig Thu May 27 16:41:53 1999 -+++ configure Thu May 27 16:48:05 1999 -@@ -2014,5 +2014,5 @@ - fi - -- -+if false; then - # Check for any special flags to pass to ltconfig. - # -@@ -2242,4 +2242,5 @@ - libtool_flags="$libtool_flags --disable-lock" - fi -+fi - - -@@ -2293,4 +2294,5 @@ - - -+if false; then - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -@@ -2316,4 +2318,5 @@ - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Redirect the config.log output again, so that the ltconfig log is not diff --git a/www/libwww/pkg/PLIST b/www/libwww/pkg/PLIST index 137c3b7cf0e..3c6093c1465 100644 --- a/www/libwww/pkg/PLIST +++ b/www/libwww/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1999/10/08 04:43:07 deberg Exp $ +@comment $NetBSD: PLIST,v 1.5 2000/06/21 02:58:26 jlam Exp $ bin/w3c bin/webbot bin/libwww-config @@ -154,50 +154,73 @@ include/w3c-libwww/WWWZip.h include/w3c-libwww/wwwconf.h include/w3c-libwww/wwwsys.h lib/libmd5.a +lib/libmd5.la lib/libmd5.so.1.0 lib/libpics.a +lib/libpics.la lib/libpics.so.0.0 lib/libwwwapp.a +lib/libwwwapp.la lib/libwwwapp.so.1.0 lib/libwwwcache.a +lib/libwwwcache.la lib/libwwwcache.so.1.0 lib/libwwwcore.a +lib/libwwwcore.la lib/libwwwcore.so.1.0 lib/libwwwdir.a +lib/libwwwdir.la lib/libwwwdir.so.1.0 lib/libwwwfile.a +lib/libwwwfile.la lib/libwwwfile.so.1.0 lib/libwwwftp.a +lib/libwwwftp.la lib/libwwwftp.so.1.0 lib/libwwwgopher.a +lib/libwwwgopher.la lib/libwwwgopher.so.1.0 lib/libwwwhttp.a +lib/libwwwhttp.la lib/libwwwhttp.so.1.0 lib/libwwwhtml.a +lib/libwwwhtml.la lib/libwwwhtml.so.1.0 lib/libwwwinit.a +lib/libwwwinit.la lib/libwwwinit.so.1.0 lib/libwwwmime.a +lib/libwwwmime.la lib/libwwwmime.so.1.0 lib/libwwwmux.a +lib/libwwwmux.la lib/libwwwmux.so.1.0 lib/libwwwnews.a +lib/libwwwnews.la lib/libwwwnews.so.1.0 lib/libwwwstream.a +lib/libwwwstream.la lib/libwwwstream.so.1.0 lib/libwwwtelnet.a +lib/libwwwtelnet.la lib/libwwwtelnet.so.1.0 lib/libwwwtrans.a +lib/libwwwtrans.la lib/libwwwtrans.so.1.0 lib/libwwwutils.a +lib/libwwwutils.la lib/libwwwutils.so.1.0 lib/libwwwxml.a +lib/libwwwxml.la lib/libwwwxml.so.1.0 lib/libwwwzip.a +lib/libwwwzip.la lib/libwwwzip.so.1.0 lib/libxmlparse.a +lib/libxmlparse.la lib/libxmlparse.so.1.0 lib/libxmltok.a +lib/libxmltok.la lib/libxmltok.so.1.0 share/doc/libwww/User/Applications.html share/doc/libwww/User/Architecture/A.gif 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 |