diff options
-rw-r--r-- | multimedia/vcdimager/Makefile | 9 | ||||
-rw-r--r-- | multimedia/vcdimager/distinfo | 4 | ||||
-rw-r--r-- | multimedia/vcdimager/files/patch-image.c | 11 | ||||
-rw-r--r-- | multimedia/vcdimager/pkg-plist | 2 | ||||
-rw-r--r-- | multimedia/vlc-devel/Makefile | 6 | ||||
-rw-r--r-- | multimedia/vlc/Makefile | 6 | ||||
-rw-r--r-- | sysutils/libcdio/Makefile | 12 | ||||
-rw-r--r-- | sysutils/libcdio/distinfo | 4 | ||||
-rw-r--r-- | sysutils/libcdio/pkg-plist | 11 |
9 files changed, 35 insertions, 30 deletions
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile index 9bac647e4714..da806ae70653 100644 --- a/multimedia/vcdimager/Makefile +++ b/multimedia/vcdimager/Makefile @@ -5,18 +5,19 @@ # $FreeBSD$ PORTNAME= vcdimager -PORTVERSION= 0.7.20 -PORTREVISION= 3 +PORTVERSION= 0.7.21 CATEGORIES= multimedia -MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/0.8.1/contrib/ \ +MASTER_SITES= ${MASTER_SITE_GNU} \ + http://download.videolan.org/pub/videolan/vlc/0.8.1/contrib/ \ http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/ +MASTER_SITE_SUBDIR= vcdimager MAINTAINER= ports@FreeBSD.org COMMENT= "GNU VCDImager/VCDRip -- The GNU VideoCD Image Maker/Ripping Tool" LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ xml2:${PORTSDIR}/textproc/libxml2 \ - cdio.2:${PORTSDIR}/sysutils/libcdio + cdio.3:${PORTSDIR}/sysutils/libcdio USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes diff --git a/multimedia/vcdimager/distinfo b/multimedia/vcdimager/distinfo index 7dac5cce85e2..e358f89b6060 100644 --- a/multimedia/vcdimager/distinfo +++ b/multimedia/vcdimager/distinfo @@ -1,2 +1,2 @@ -MD5 (vcdimager-0.7.20.tar.gz) = fc36c46e296671f2fc35b6811a1aeb52 -SIZE (vcdimager-0.7.20.tar.gz) = 954324 +MD5 (vcdimager-0.7.21.tar.gz) = d3a02f309d0e487be2a2eb1187a70afa +SIZE (vcdimager-0.7.21.tar.gz) = 983861 diff --git a/multimedia/vcdimager/files/patch-image.c b/multimedia/vcdimager/files/patch-image.c deleted file mode 100644 index 0e7eccc4cfce..000000000000 --- a/multimedia/vcdimager/files/patch-image.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/image.c.orig Sat Jun 26 14:47:53 2004 -+++ lib/image.c Sat Jun 26 14:48:01 2004 -@@ -76,7 +76,7 @@ - } - - int --vcd_image_sink_write (VcdImageSink *obj, void *buf, uint32_t lsn) -+vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn) - { - vcd_assert (obj != NULL); - diff --git a/multimedia/vcdimager/pkg-plist b/multimedia/vcdimager/pkg-plist index eaca3aa421b1..9de1d117e351 100644 --- a/multimedia/vcdimager/pkg-plist +++ b/multimedia/vcdimager/pkg-plist @@ -13,7 +13,7 @@ include/libvcd/logging.h include/libvcd/sector.h include/libvcd/types.h include/libvcd/version.h -lib/libvcdinfo.so.0 +lib/libvcdinfo.so.1 lib/libvcdinfo.so lib/libvcdinfo.a libdata/pkgconfig/libvcdinfo.pc diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index d614831e24dd..006800a9f6f6 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -167,7 +167,7 @@ PORTNAME= vlc PORTVERSION= 0.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ @@ -364,8 +364,8 @@ CONFIGURE_ARGS+= --disable-arts .endif .if !defined(WITHOUT_CDROM) -LIB_DEPENDS+= vcdinfo.0:${PORTSDIR}/multimedia/vcdimager \ - cdio.2:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= vcdinfo.1:${PORTSDIR}/multimedia/vcdimager \ + cdio.3:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+=--enable-vcd \ --enable-libcddb \ --enable-libcdio diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index d614831e24dd..006800a9f6f6 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -167,7 +167,7 @@ PORTNAME= vlc PORTVERSION= 0.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ @@ -364,8 +364,8 @@ CONFIGURE_ARGS+= --disable-arts .endif .if !defined(WITHOUT_CDROM) -LIB_DEPENDS+= vcdinfo.0:${PORTSDIR}/multimedia/vcdimager \ - cdio.2:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= vcdinfo.1:${PORTSDIR}/multimedia/vcdimager \ + cdio.3:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+=--enable-vcd \ --enable-libcddb \ --enable-libcdio diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile index 9cfe07edae59..03e662a395f4 100644 --- a/sysutils/libcdio/Makefile +++ b/sysutils/libcdio/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= libcdio -PORTVERSION= 0.70 +PORTVERSION= 0.71 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libcdio @@ -13,14 +13,22 @@ MASTER_SITE_SUBDIR= libcdio MAINTAINER= arved@FreeBSD.org COMMENT= Compact Disc Input and Control Library -LIB_DEPENDS= cddb.1:${PORTSDIR}/audio/libcddb +LIB_DEPENDS= cddb.1:${PORTSDIR}/audio/libcddb \ + popt.0:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes USE_GNOME= gnometarget pkgconfig gnomehack USE_GMAKE= yes +USE_ICONV= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS+= --with-libpopt-prefix=${LOCALBASE} \ + --with-libiconv-prefix=${LOCALBASE} USE_REINPLACE= yes +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" INFO= libcdio +post-patch: + ${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd5\.\*|freebsd6\.\*," ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/sysutils/libcdio/distinfo b/sysutils/libcdio/distinfo index 6bf6758df95a..83f77d7b14d1 100644 --- a/sysutils/libcdio/distinfo +++ b/sysutils/libcdio/distinfo @@ -1,2 +1,2 @@ -MD5 (libcdio-0.70.tar.gz) = df529a987127692031bd02633a6655eb -SIZE (libcdio-0.70.tar.gz) = 1474322 +MD5 (libcdio-0.71.tar.gz) = c80a6bb2f47b6d17a807fff4f36bdb53 +SIZE (libcdio-0.71.tar.gz) = 1531090 diff --git a/sysutils/libcdio/pkg-plist b/sysutils/libcdio/pkg-plist index 5910c75aea73..885afccc42a3 100644 --- a/sysutils/libcdio/pkg-plist +++ b/sysutils/libcdio/pkg-plist @@ -1,6 +1,13 @@ +bin/cd-drive +bin/cd-info +bin/iso-info +bin/iso-read +include/cdio/bytesex.h +include/cdio/bytesex_asm.h include/cdio/cd_types.h include/cdio/cdio.h include/cdio/cdtext.h +include/cdio/ds.h include/cdio/dvd.h include/cdio/iso9660.h include/cdio/logging.h @@ -13,11 +20,11 @@ include/cdio/xa.h lib/libcdio.a lib/libcdio.la lib/libcdio.so -lib/libcdio.so.2 +lib/libcdio.so.3 lib/libiso9660.a lib/libiso9660.la lib/libiso9660.so -lib/libiso9660.so.2 +lib/libiso9660.so.3 libdata/pkgconfig/libcdio.pc libdata/pkgconfig/libiso9660.pc @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true |