Merge changes in the main trunk into the buildlink2 branch for those

packages that have been converted to USE_BUILDLINK2.
jsonn · Aug 25, 2002 · b94f1fd · b94f1fd
1 parent f985611
commit b94f1fd
Show file tree

Hide file tree

Showing 206 changed files with 1,994 additions and 997 deletions.
diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.8.2.2 2002/06/21 23:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.8.2.3 2002/08/25 21:19:46 jlam Exp $
 #
 
-VERS=			1.07
+VERS=			1.08
 DISTNAME=		lzo-${VERS}
 PKGNAME=		liblzo-${VERS}
 CATEGORIES=		archivers
-MASTER_SITES=		http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/ \
-			ftp://wildsau.idv.uni-linz.ac.at/pub/mfx/lzo/ \
+MASTER_SITES=		http://www.oberhumer.com/opensource/lzo/download/ \
 			${MASTER_SITE_SUNSITE:=libs/compression/} \
 			ftp://ftp.elf.stuba.sk/pub/pc/pack/
 
 MAINTAINER=		rh@netbsd.org
-HOMEPAGE=		http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+HOMEPAGE=		http://www.oberhumer.com/opensource/lzo/
 COMMENT=		Portable lossless data compression library written in ANSI C
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/acconfig/ltconfig
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 # Don't spuriously detect zlib, as it's not needed for the library.
 CONFIGURE_ENV+=		ac_cv_lib_z_gzputs=no

diff --git a/archivers/liblzo/distinfo b/archivers/liblzo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/10/22 01:13:11 mjl Exp $
+$NetBSD: distinfo,v 1.3.2.1 2002/08/25 21:19:47 jlam Exp $
 
-SHA1 (lzo-1.07.tar.gz) = b47208b1aa0e734adecd396d7ab123a5e20e5808
-Size (lzo-1.07.tar.gz) = 333763 bytes
+SHA1 (lzo-1.08.tar.gz) = ad1b458cf9d5d49153665d2adc25bd6129028221
+Size (lzo-1.08.tar.gz) = 426692 bytes
diff --git a/audio/vorbis-tools/DESCR b/audio/vorbis-tools/DESCR
@@ -7,4 +7,4 @@ systems.
   * ogg123 plays Ogg Vorbis files or URLs streamed via HTTP
   * vorbiscomment can list or set comments in an .ogg file
 
-This package is vorbis-tools 1.0 rc3
+This package is vorbis-tools 1.0
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13.2.2 2002/06/21 23:04:59 jlam Exp $
+# $NetBSD: Makefile,v 1.13.2.3 2002/08/25 21:19:49 jlam Exp $
 
-DISTNAME=	vorbis-tools-1.0rc3
-PKGNAME=	vorbis-tools-1.0.0.7
-PKGREVISION=	1
+DISTNAME=	vorbis-tools-1.0
+PKGNAME=	vorbis-tools-1.0.0.8
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/rc3/unix/
+MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
 
 MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.vorbis.com/
@@ -20,21 +19,18 @@ CONFLICTS=	vorbis-[0-9]*
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-#CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_DIR}		\
-#			--with-vorbis-prefix=${BUILDLINK_DIR}		\
-#			--with-ao-prefix=${BUILDLINK_DIR}
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_PREFIX.libogg}	\
+			--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
+			--with-ao-prefix=${BUILDLINK_PREFIX.libao}
 
 PLIST_SUBST+=	DISTNAME="${DISTNAME}"
 
-# vorbis-tools needs a working pthreads implementation, and pth is proven
-# to work.
-#
-USE_PTHREAD=	native pth
+PTHREAD_OPTS+=	require
 
 .include "../../audio/libao/buildlink2.mk"
 .include "../../audio/libogg/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
-
 .include "../../mk/pthread.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/03/19 07:48:43 lukem Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:19:50 jlam Exp $
 
-SHA1 (vorbis-tools-1.0rc3.tar.gz) = e5c08f24eb143f0790b37b4cf49a4905a37c6e44
-Size (vorbis-tools-1.0rc3.tar.gz) = 259239 bytes
-SHA1 (patch-aa) = 065dc2c262d0dcab0f97f3c56b018be0a3966db2
-SHA1 (patch-ab) = d22ceee8f01a4c7748adab69acb95575dbe4940a
+SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
+Size (vorbis-tools-1.0.tar.gz) = 425404 bytes
diff --git a/audio/vorbis-tools/patches/patch-aa b/audio/vorbis-tools/patches/patch-aa
diff --git a/audio/vorbis-tools/patches/patch-ab b/audio/vorbis-tools/patches/patch-ab
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
@@ -1,33 +1,16 @@
-# $NetBSD: Makefile,v 1.16.2.3 2002/06/23 18:40:37 jlam Exp $
+# $NetBSD: Makefile,v 1.16.2.4 2002/08/25 21:19:52 jlam Exp $
 #
 
-DISTNAME=	gaim-0.58
-CATEGORIES=	chat x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
-		ftp://ftp.marko.net/pub/gaim/
+.include "Makefile.common"
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://gaim.sourceforge.net/
-COMMENT=	GTK+-based client for AOL's Instant Messenger chat system
+CONFLICTS+=		gaim-gnome-[0-9]*
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
-USE_X11BASE=		YES
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--disable-artsc
 CONFIGURE_ARGS+=	--disable-gnome
-CONFIGURE_ARGS+=	--disable-nas
 CONFIGURE_ARGS+=	--disable-panel
-CONFIGURE_ARGS+=	--disable-perl
-CONFIGURE_ARGS+=	--disable-screensaver
 
-CONFIGURE_ARGS+=	--enable-esd
-CONFIGURE_ARGS+=	--enable-perl
-CONFIGURE_ARGS+=	--enable-pixbuf
+PLIST_SRC+=		${.CURDIR}/../gaim/PLIST
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"

diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.common,v 1.1.4.2 2002/08/25 21:19:53 jlam Exp $
+#
+
+DISTNAME=	gaim-0.59
+CATEGORIES=	chat x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
+		ftp://ftp.marko.net/pub/gaim/
+
+MAINTAINER=	rafal@netbsd.org
+HOMEPAGE=	http://gaim.sourceforge.net/
+COMMENT=	GTK+-based client for AOL's Instant Messenger chat system
+
+DISTINFO_FILE=	${.CURDIR}/../gaim/distinfo
+FILESDIR=	${.CURDIR}/../gaim/files
+PATCHDIR=	${.CURDIR}/../gaim/patches
+PKGDIR=		${.CURDIR}/../gaim
+PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
+
+USE_GMAKE=		YES
+USE_X11BASE=		YES
+
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--disable-artsc
+CONFIGURE_ARGS+=	--disable-nas
+CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--disable-screensaver
+
+CONFIGURE_ARGS+=	--enable-esd
+CONFIGURE_ARGS+=	--enable-perl
+CONFIGURE_ARGS+=	--enable-pixbuf
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
@@ -1,52 +1,2 @@
-@comment $NetBSD: PLIST,v 1.6.2.1 2002/06/23 18:40:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.2 2002/08/25 21:19:54 jlam Exp $
 bin/gaim
-lib/gaim/autorecon.so
-lib/gaim/chatlist.so
-lib/gaim/iconaway.so
-lib/gaim/libgg.a
-lib/gaim/libgg.la
-lib/gaim/libgg.so
-lib/gaim/libicq.a
-lib/gaim/libicq.la
-lib/gaim/libicq.so
-lib/gaim/libirc.a
-lib/gaim/libirc.la
-lib/gaim/libirc.so
-lib/gaim/libjabber.a
-lib/gaim/libjabber.la
-lib/gaim/libjabber.so
-lib/gaim/libmsn.a
-lib/gaim/libmsn.la
-lib/gaim/libmsn.so
-lib/gaim/libnapster.a
-lib/gaim/libnapster.la
-lib/gaim/libnapster.so
-lib/gaim/libyahoo.a
-lib/gaim/libyahoo.la
-lib/gaim/libyahoo.so
-lib/gaim/libzephyr.a
-lib/gaim/libzephyr.la
-lib/gaim/libzephyr.so
-lib/gaim/notify.so
-lib/gaim/spellchk.so
-man/man1/gaim.1
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
-share/gnome/apps/Internet/gaim.desktop
-share/pixmaps/gaim.xpm
-@unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE}
-@dirrm lib/gaim
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
@@ -0,0 +1,52 @@
+@comment $NetBSD: PLIST.common,v 1.1.4.2 2002/08/25 21:19:55 jlam Exp $
+lib/gaim/autorecon.so
+lib/gaim/chatlist.so
+lib/gaim/iconaway.so
+lib/gaim/libgg.a
+lib/gaim/libgg.la
+lib/gaim/libgg.so
+lib/gaim/libicq.a
+lib/gaim/libicq.la
+lib/gaim/libicq.so
+lib/gaim/libirc.a
+lib/gaim/libirc.la
+lib/gaim/libirc.so
+lib/gaim/libjabber.a
+lib/gaim/libjabber.la
+lib/gaim/libjabber.so
+lib/gaim/libmsn.a
+lib/gaim/libmsn.la
+lib/gaim/libmsn.so
+lib/gaim/libnapster.a
+lib/gaim/libnapster.la
+lib/gaim/libnapster.so
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.la
+lib/gaim/libyahoo.so
+lib/gaim/libzephyr.a
+lib/gaim/libzephyr.la
+lib/gaim/libzephyr.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
+man/man1/gaim.1
+share/gnome/apps/Internet/gaim.desktop
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
+share/pixmaps/gaim.xpm
+@dirrm lib/gaim
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9.2.1 2002/06/23 18:40:38 jlam Exp $
+$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:19:56 jlam Exp $
 
-SHA1 (gaim-0.58.tar.gz) = 5fd319a8de5f13efd646d7fe2d66ec6e9fb09eec
-Size (gaim-0.58.tar.gz) = 1928057 bytes
-SHA1 (patch-aa) = d4ad7522469c6f73c5497635f32acbabae9b89b9
+SHA1 (gaim-0.59.tar.gz) = 0a74bc3b48810291adf9725966efc4a6de28fa3f
+Size (gaim-0.59.tar.gz) = 2047105 bytes
+SHA1 (patch-aa) = f56e9e5ee36db05adc1ba34294cf088a335117fe
+SHA1 (patch-ab) = c15b6d79f8129eee9298f0aae6d0ca4e39983655
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4.2.1 2002/06/23 18:40:39 jlam Exp $
+$NetBSD: patch-aa,v 1.4.2.2 2002/08/25 21:19:56 jlam Exp $
 
---- configure.orig	Tue May 14 04:40:41 2002
+--- configure.orig	Tue Jun 25 06:23:07 2002
 +++ configure
-@@ -10792,8 +10792,6 @@
+@@ -7762,8 +7762,6 @@
  fi
- rm -f conftest.$ac_objext conftest.$ac_ext
+ rm -f conftest*
 
 -CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
 -