From 4264f62e372faef2405f4c3ebfd8b255096df614 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 30 Jul 2007 06:04:51 +0000 Subject: Sync w/ FreeBSD ports related w/ libvorbis stuff. Will you let me update in my system success pretty please? ;-) git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9273 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/easytag/Makefile | 4 ++-- audio/glame/Makefile | 4 ++-- audio/libvorbis/Makefile | 7 ++++--- audio/libvorbis/distinfo | 6 +++--- audio/libvorbis/files/patch-Makefile.in | 12 ++++++------ audio/libvorbis/files/patch-doc_Makefile.in | 18 +++++++++--------- audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in | 18 +++++++++--------- audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in | 18 +++++++++--------- audio/libvorbis/pkg-plist | 9 +++++---- audio/liteamp/Makefile | 4 ++-- audio/muine/Makefile | 6 +++--- audio/sweep/Makefile | 4 ++-- audio/terminatorx/Makefile | 6 +++--- games/gcompris/Makefile | 6 +++--- 14 files changed, 62 insertions(+), 60 deletions(-) diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index c2c6350e4..f9d7b6e97 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -8,7 +8,7 @@ PORTNAME= easytag PORTVERSION= 1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,7 @@ MAINTAINER= wxs@atarininja.org COMMENT= Tag editor for MP3 and OGG files LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ - vorbis.3:${PORTSDIR}/audio/libvorbis \ + vorbis.4:${PORTSDIR}/audio/libvorbis \ FLAC.7:${PORTSDIR}/audio/flac MAN1= easytag.1 diff --git a/audio/glame/Makefile b/audio/glame/Makefile index ae58a4248..b7c55562c 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -7,7 +7,7 @@ PORTNAME= glame PORTVERSION= 2.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +18,7 @@ COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ mad.2:${PORTSDIR}/audio/libmad \ - vorbis.3:${PORTSDIR}/audio/libvorbis \ + vorbis.4:${PORTSDIR}/audio/libvorbis \ guile.15:${PORTSDIR}/lang/guile USE_XORG= xbitmaps diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index fe0f81f3a..65a4fd937 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -6,10 +6,11 @@ # PORTNAME= libvorbis -PORTVERSION= 1.1.2 +PORTVERSION= 1.2.0 PORTEPOCH= 4 CATEGORIES= audio -MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ +MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ \ + http://freebsd.unixfreunde.de/sources/ MAINTAINER= naddy@FreeBSD.org COMMENT= Audio compression codec library @@ -20,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes USE_GNOME= gnomehack CONFIGURE_ARGS= --with-ogg=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .if defined(NOPORTDOCS) MAKE_ENV= DOC="" diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo index 5dffde0d7..6e84d5b5c 100644 --- a/audio/libvorbis/distinfo +++ b/audio/libvorbis/distinfo @@ -1,3 +1,3 @@ -MD5 (libvorbis-1.1.2.tar.gz) = 37847626b8e1b53ae79a34714c7b3211 -SHA256 (libvorbis-1.1.2.tar.gz) = 3f7135ccbda589c251017912f5f5ec9da626c976d2376bcfda19ad6b9c4a6050 -SIZE (libvorbis-1.1.2.tar.gz) = 1316434 +MD5 (libvorbis-1.2.0.tar.gz) = 478646358c49f34aedcce58948793619 +SHA256 (libvorbis-1.2.0.tar.gz) = 6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73 +SIZE (libvorbis-1.2.0.tar.gz) = 1494373 diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in index 7807bdf45..6b363dcf1 100644 --- a/audio/libvorbis/files/patch-Makefile.in +++ b/audio/libvorbis/files/patch-Makefile.in @@ -1,12 +1,12 @@ $FreeBSD$ ---- Makefile.in.orig Sun Apr 29 22:42:17 2007 -+++ Makefile.in Sun Apr 29 22:42:36 2007 -@@ -217,7 +217,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = foreign dist-zip +--- Makefile.in.orig 2007-07-26 21:46:30.000000000 +0000 ++++ Makefile.in 2007-07-26 21:49:02.000000000 +0000 +@@ -221,7 +221,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2 -SUBDIRS = lib include doc examples vq +SUBDIRS = lib include $(DOC) examples vq m4datadir = $(datadir)/aclocal diff --git a/audio/libvorbis/files/patch-doc_Makefile.in b/audio/libvorbis/files/patch-doc_Makefile.in index 574bbb029..3564cba53 100644 --- a/audio/libvorbis/files/patch-doc_Makefile.in +++ b/audio/libvorbis/files/patch-doc_Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- doc/Makefile.in.orig Fri Sep 24 02:11:04 2004 -+++ doc/Makefile.in Fri Sep 24 02:11:14 2004 -@@ -184,7 +184,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - SUBDIRS = vorbisfile vorbisenc +--- doc/Makefile.in.orig 2007-07-26 21:50:20.000000000 +0000 ++++ doc/Makefile.in 2007-07-26 21:50:57.000000000 +0000 +@@ -162,7 +162,7 @@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +docdir = $(datadir)/doc/$(PACKAGE) - - ### all of the static docs, commited to SVN and included as is - static_docs = \ + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ diff --git a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in index 687548cb1..aabc0b792 100644 --- a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in +++ b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- doc/vorbisenc/Makefile.in.orig Fri Sep 24 02:11:29 2004 -+++ doc/vorbisenc/Makefile.in Fri Sep 24 02:11:45 2004 -@@ -174,7 +174,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ +--- doc/vorbisenc/Makefile.in.orig 2007-07-26 21:52:03.000000000 +0000 ++++ doc/vorbisenc/Makefile.in 2007-07-26 21:53:07.000000000 +0000 +@@ -150,7 +150,7 @@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc +docdir = $(datadir)/doc/$(PACKAGE)/vorbisenc - doc_DATA = index.html overview.html reference.html style.css\ - vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html\ - vorbis_encode_init_vbr.html + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ diff --git a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in index 1e7550555..97457f6b0 100644 --- a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in +++ b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- doc/vorbisfile/Makefile.in.orig Fri Sep 24 02:11:56 2004 -+++ doc/vorbisfile/Makefile.in Fri Sep 24 02:12:12 2004 -@@ -174,7 +174,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ +--- doc/vorbisfile/Makefile.in.bak 2007-07-25 16:46:35.000000000 +0000 ++++ doc/vorbisfile/Makefile.in 2007-07-26 21:53:26.000000000 +0000 +@@ -150,7 +150,7 @@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile +docdir = $(datadir)/doc/$(PACKAGE)/vorbisfile - doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\ - chainingexample.html crosslap.html datastructures.html decoding.html\ - example.html exampleindex.html fileinfo.html index.html\ + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist index acce25432..ce2131b60 100644 --- a/audio/libvorbis/pkg-plist +++ b/audio/libvorbis/pkg-plist @@ -5,7 +5,7 @@ include/vorbis/vorbisfile.h lib/libvorbis.a lib/libvorbis.la lib/libvorbis.so -lib/libvorbis.so.3 +lib/libvorbis.so.4 lib/libvorbisenc.a lib/libvorbisenc.la lib/libvorbisenc.so @@ -13,13 +13,14 @@ lib/libvorbisenc.so.2 lib/libvorbisfile.a lib/libvorbisfile.la lib/libvorbisfile.so -lib/libvorbisfile.so.4 +lib/libvorbisfile.so.5 libdata/pkgconfig/vorbis.pc libdata/pkgconfig/vorbisenc.pc libdata/pkgconfig/vorbisfile.pc share/aclocal/vorbis.m4 %%PORTDOCS%%%%DOCSDIR%%/components.png -%%PORTDOCS%%%%DOCSDIR%%/draft-kerr-avt-vorbis-rtp-03.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-avt-rtp-vorbis-06.txt +%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-avt-rtp-vorbis-06.xml %%PORTDOCS%%%%DOCSDIR%%/eightphase.png %%PORTDOCS%%%%DOCSDIR%%/evenlsp.png %%PORTDOCS%%%%DOCSDIR%%/floor1-1.png @@ -121,6 +122,6 @@ share/aclocal/vorbis.m4 %%PORTDOCS%%%%DOCSDIR%%/window1.png %%PORTDOCS%%%%DOCSDIR%%/window2.png @dirrm include/vorbis -%%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisenc %%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisfile +%%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisenc %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile index d3f5b3cc1..3fbab0824 100644 --- a/audio/liteamp/Makefile +++ b/audio/liteamp/Makefile @@ -6,7 +6,7 @@ PORTNAME= liteamp PORTVERSION= 0.2.3.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= audio gnome MASTER_SITES= http://kldp.net/frs/download.php/547/ @@ -15,7 +15,7 @@ COMMENT= Light-weight Music Player for GNOME2 LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/mad \ - vorbisfile.4:${PORTSDIR}/audio/libvorbis + vorbisfile.5:${PORTSDIR}/audio/libvorbis USE_XLIB= yes USE_GMAKE= yes diff --git a/audio/muine/Makefile b/audio/muine/Makefile index c42bfa4ff..322d7e570 100644 --- a/audio/muine/Makefile +++ b/audio/muine/Makefile @@ -3,12 +3,12 @@ # Whom: Tom McLaughlin # # $FreeBSD$ -# $Id: Makefile,v 1.8 2007-05-19 21:35:58 marcus Exp $ +# $Id: Makefile,v 1.9 2007-07-30 06:04:51 mezz Exp $ # PORTNAME= muine PORTVERSION= 0.8.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio gnome MASTER_SITES= http://muine-player.org/releases/ @@ -18,7 +18,7 @@ COMMENT= Mono based Gnome audio player LIB_DEPENDS= FLAC.7:${PORTSDIR}/audio/flac \ id3tag.0:${PORTSDIR}/audio/libid3tag \ gdbm:${PORTSDIR}/databases/gdbm \ - vorbis.3:${PORTSDIR}/audio/libvorbis \ + vorbis.4:${PORTSDIR}/audio/libvorbis \ musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 21994d638..7a20daab0 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -7,7 +7,7 @@ PORTNAME= sweep PORTVERSION= 0.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,7 @@ COMMENT= A sound editor for the GNOME/GTK 2.0 desktop LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ samplerate.1:${PORTSDIR}/audio/libsamplerate \ - vorbis.3:${PORTSDIR}/audio/libvorbis \ + vorbis.4:${PORTSDIR}/audio/libvorbis \ speex.1:${PORTSDIR}/audio/speex \ mad.2:${PORTSDIR}/audio/mad diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile index 3b052c4ab..ae8a0cfdc 100644 --- a/audio/terminatorx/Makefile +++ b/audio/terminatorx/Makefile @@ -3,11 +3,11 @@ # Whom: Tilman Linneweh # # $FreeBSD$ -# $MCom: ports/audio/terminatorx/Makefile,v 1.3 2007/05/02 17:51:13 ahze Exp $ +# $MCom: ports/audio/terminatorx/Makefile,v 1.4 2007/05/19 21:36:00 marcus Exp $ PORTNAME= terminatorx PORTVERSION= 3.82 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= http://terminatorx.org/dist/ DISTNAME= terminatorX-${PORTVERSION} @@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --disable-sox .if !defined(WITHOUT_VORBIS) BUILD_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools -LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+= --disable-vorbis .endif diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 97c5542d4..4d3116a93 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -2,12 +2,12 @@ # Date created: 23 April 2003 # Whom: Martin Klaffenboeck # -# $FreeBSD: ports/games/gcompris/Makefile,v 1.37 2007/07/02 06:19:35 marcus Exp $ +# $FreeBSD$ # PORTNAME= gcompris DISTVERSION= 8.3.2-2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gcompris @@ -18,7 +18,7 @@ COMMENT= Gnome2 educational games and activities for kids ages 2 to 10 BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html \ gnuchess:${PORTSDIR}/games/gnuchess \ ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20 -LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ +LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ ao.3:${PORTSDIR}/audio/libao \ assetml.0:${PORTSDIR}/devel/libassetml \ sqlite3.8:${PORTSDIR}/databases/sqlite3 -- cgit v1.2.3