diff options
| -rw-r--r-- | audio/adplay/Makefile | 10 | ||||
| -rw-r--r-- | audio/adplay/pkg-descr | 3 | ||||
| -rw-r--r-- | audio/libadplug/Makefile | 20 | ||||
| -rw-r--r-- | audio/libadplug/pkg-descr | 3 | ||||
| -rw-r--r-- | audio/ocp/Makefile | 10 | ||||
| -rw-r--r-- | audio/ocp/pkg-descr | 6 | ||||
| -rw-r--r-- | devel/libbinio/Makefile | 12 | ||||
| -rw-r--r-- | devel/libbinio/distinfo | 4 | ||||
| -rw-r--r-- | devel/libbinio/pkg-descr | 3 | ||||
| -rw-r--r-- | devel/libbinio/pkg-plist | 10 |
10 files changed, 42 insertions, 39 deletions
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile index 823a36ba68d7..0df696dda305 100644 --- a/audio/adplay/Makefile +++ b/audio/adplay/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: adplay -# Date created: 10 August 2004 -# Whom: Emanuel Haupt <ehaupt@critical.ch> +# New ports collection makefile for: adplay +# Date created: 10 August 2004 +# Whom: Emanuel Haupt <ehaupt@critical.ch> # # $FreeBSD$ # PORTNAME= adplay PORTVERSION= 1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= adplug @@ -22,7 +22,7 @@ PLIST_FILES= bin/adplay GNU_CONFIGURE= yes USE_GCC= 3.4+ -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ diff --git a/audio/adplay/pkg-descr b/audio/adplay/pkg-descr index 03298633b9d5..0e2e659b0783 100644 --- a/audio/adplay/pkg-descr +++ b/audio/adplay/pkg-descr @@ -2,6 +2,3 @@ Adplay is a command line AdLib player using the adplug library. It supports many AdLib formats such as HSP and HSC. WWW: http://adplug.sourceforge.net/ - -- ehaupt -ehaupt@critical.ch diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile index 67436679eb11..7eb89dd99713 100644 --- a/audio/libadplug/Makefile +++ b/audio/libadplug/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: adplug -# Date created: 10 August 2004 -# Whom: Emanuel Haupt <ehaupt@critical.ch> +# New ports collection makefile for: libadplug +# Date created: 10 August 2004 +# Whom: Emanuel Haupt <ehaupt@critical.ch> # # $FreeBSD$ # PORTNAME= libadplug PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= adplug @@ -34,6 +34,18 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ MAN1= adplugdb.1 post-patch: + @${REINPLACE_CMD} -e 's|\(binio\.h\)|libbinio/\1|' \ + ${WRKSRC}/src/database.cpp \ + ${WRKSRC}/src/database.h \ + ${WRKSRC}/src/fprovide.cpp \ + ${WRKSRC}/src/fprovide.h + @${REINPLACE_CMD} -e 's|\(binfile\.h\)|libbinio/\1|' \ + ${WRKSRC}/adplugdb/adplugdb.cpp \ + ${WRKSRC}/src/adplug.cpp \ + ${WRKSRC}/src/database.cpp \ + ${WRKSRC}/src/fprovide.cpp + @${REINPLACE_CMD} -e 's|\(binstr\.h\)|libbinio/\1|' \ + ${WRKSRC}/src/dmo.cpp @${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src adplugdb test|' \ ${WRKSRC}/Makefile.in diff --git a/audio/libadplug/pkg-descr b/audio/libadplug/pkg-descr index 2320ff36a8e3..6d2f3b2c9ea7 100644 --- a/audio/libadplug/pkg-descr +++ b/audio/libadplug/pkg-descr @@ -10,6 +10,3 @@ players, like Winamp and XMMS, as well as stand-alone players for many different systems available. WWW: http://adplug.sourceforge.net/ - -- ehaupt -ehaupt@critical.ch diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index f63620b640e0..741070e3c49e 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: ocp -# Date created: 22 April 2005 -# Whom: Emanuel Haupt <ehaupt@critical.ch> +# New ports collection makefile for: ocp +# Date created: 22 April 2005 +# Whom: Emanuel Haupt <ehaupt@critical.ch> # # $FreeBSD$ # PORTNAME= ocp PORTVERSION= 0.1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://labs.nixia.no/ \ http://critical.ch/distfiles/ @@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-debug .endif .if defined(WITH_ADPLUG) LIB_DEPENDS+= adplug-1.5.1:${PORTSDIR}/audio/libadplug -CONFIGURE_ARGS+= --without-x11 +CONFIGURE_ARGS+= --without-x11 --with-adplug PLIST_SUB+= ADPLUG="" .else PLIST_SUB+= ADPLUG="@comment " diff --git a/audio/ocp/pkg-descr b/audio/ocp/pkg-descr index 5c7b51e357ae..ff4c84319eb7 100644 --- a/audio/ocp/pkg-descr +++ b/audio/ocp/pkg-descr @@ -7,9 +7,7 @@ terms of the GNU General Public License, and around 2003 Stian Skjelstad ported the code to Linux. In addition to legacy tracker formats such as mod, xm and s3m, Open -Cubic Player now also supports mp3 and ogg files. +Cubic Player now also supports mp3 and ogg files and can be compiled +with libadplug support. WWW: http://freshmeat.net/projects/opencubicplayer/ - -- ehaupt -ehaupt@critical.ch diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile index a9cc0cb23062..87384c8a331d 100644 --- a/devel/libbinio/Makefile +++ b/devel/libbinio/Makefile @@ -1,13 +1,12 @@ -# New ports collection makefile for: libbinio -# Date created: 10 August 2004 -# Whom: Emanuel Haupt <ehaupt@critical.ch> +# New ports collection makefile for: libbinio +# Date created: 10 August 2004 +# Whom: Emanuel Haupt <ehaupt@critical.ch> # # $FreeBSD$ # PORTNAME= libbinio -PORTVERSION= 1.3 -PORTREVISION= 1 +PORTVERSION= 1.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -29,7 +28,8 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" post-patch: - @${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src|' \ + @${REINPLACE_CMD} -e 's|^\(SUBDIRS\ =\).*|\1 src|; \ + s|^\(pkgconfigdir\).*|\1 = ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff --git a/devel/libbinio/distinfo b/devel/libbinio/distinfo index 755d5da543c7..e2dcd264a153 100644 --- a/devel/libbinio/distinfo +++ b/devel/libbinio/distinfo @@ -1,2 +1,2 @@ -MD5 (libbinio-1.3.tar.gz) = 2bee4db14e3b3ef45a58291b7c9b5898 -SIZE (libbinio-1.3.tar.gz) = 434702 +MD5 (libbinio-1.4.tar.gz) = bc2efd55a4569ddaf5a3e7bd5639c616 +SIZE (libbinio-1.4.tar.gz) = 434961 diff --git a/devel/libbinio/pkg-descr b/devel/libbinio/pkg-descr index 943899aaf6cc..2fc6aad3453e 100644 --- a/devel/libbinio/pkg-descr +++ b/devel/libbinio/pkg-descr @@ -9,6 +9,3 @@ It further employs no special I/O protocol and can be used on arbitrary binary data sources. WWW: http://libbinio.sourceforge.net/ - -- ehaupt -ehaupt@critical.ch diff --git a/devel/libbinio/pkg-plist b/devel/libbinio/pkg-plist index 4ca7f6b1ea4a..b7909ad6e3af 100644 --- a/devel/libbinio/pkg-plist +++ b/devel/libbinio/pkg-plist @@ -1,7 +1,9 @@ -include/binfile.h -include/binio.h -include/binstr.h -include/binwrap.h +include/libbinio/binfile.h +include/libbinio/binio.h +include/libbinio/binstr.h +include/libbinio/binwrap.h +@dirrm include/libbinio lib/libbinio.a lib/libbinio.so lib/libbinio.so.1 +libdata/pkgconfig/libbinio.pc |