ports/86431: maintainer-update: devel/libbinio 1.3 -> 1.4

Wed Sep 21 21:50:08 UTC 2005

>Number:         86431
>Category:       ports
>Synopsis:       maintainer-update: devel/libbinio 1.3 -> 1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 21 21:50:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Emanuel Haupt
>Release:        FreeBSD 5.4-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD beaver.critical.ch 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Wed Jul 27 20:19:15 CEST 2005 root at beaver.critical.ch:/usr/obj/usr/src/RELENG_5_4/src/sys/BEAVER i386


	
>Description:
libbinio.patch:
==============

- update devel/libbinio from version 1.3 to 1.4
- remove signature from pkg-descr
- cleanup Makefile header

CVS:
changed: Makefile
changed: pkg-descr
changed: pkg-plist


adplay.patch:
============

- bump PORTREVISION from audio/adplay
- remove signature from pkg-descr
- cleanup Makefile header


CVS:
changed: Makefile
changed: pkg-descr


libadplug.patch:
===============

- bump PORTREVISION from audio/libadplug
- patch path for libbinio header files
- remove signature from pkg-descr
- cleanup Makefile header

CVS:
changed: Makefile
changed: pkg-descr


ocp.patch:
=========

- bump PORTREVISION from audio/ocp
- remove signature from pkg-descr
- cleanup Makefile header

CVS:
changed: Makefile
changed: pkg-descr


>How-To-Repeat:
	
>Fix:

--- libbinio.patch begins here ---
diff -Nur libbinio.orig/Makefile libbinio/Makefile
--- libbinio.orig/Makefile	Tue May 31 23:24:38 2005
+++ libbinio/Makefile	Wed Sep 21 23:16:44 2005
@@ -1,13 +1,12 @@
-# New ports collection makefile for:   libbinio
-# Date created:		10 August 2004
-# Whom:			Emanuel Haupt <ehaupt at critical.ch>
+# New ports collection makefile for:	libbinio
+# Date created:				10 August 2004
+# Whom:					Emanuel Haupt <ehaupt at critical.ch>
 #
 # $FreeBSD: ports/devel/libbinio/Makefile,v 1.2 2005/05/31 21:24:38 flz Exp $
 #
 
 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 @@
 		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 -Nur libbinio.orig/distinfo libbinio/distinfo
--- libbinio.orig/distinfo	Mon May  9 22:13:31 2005
+++ libbinio/distinfo	Wed Sep 21 21:24:57 2005
@@ -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 -Nur libbinio.orig/pkg-descr libbinio/pkg-descr
--- libbinio.orig/pkg-descr	Mon May  9 22:13:31 2005
+++ libbinio/pkg-descr	Wed Sep 21 23:16:50 2005
@@ -9,6 +9,3 @@
 binary data sources.
 
 WWW: http://libbinio.sourceforge.net/
-
-- ehaupt
-ehaupt at critical.ch
diff -Nur libbinio.orig/pkg-plist libbinio/pkg-plist
--- libbinio.orig/pkg-plist	Mon May  9 22:13:31 2005
+++ libbinio/pkg-plist	Wed Sep 21 21:48:43 2005
@@ -1,7 +1,8 @@
-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
 lib/libbinio.a
 lib/libbinio.so
 lib/libbinio.so.1
+libdata/pkgconfig/libbinio.pc
--- libbinio.patch ends here ---

--- ocp.patch begins here ---
diff -Nur ocp.orig/Makefile ocp/Makefile
--- ocp.orig/Makefile	Fri Jul 29 10:55:37 2005
+++ ocp/Makefile	Wed Sep 21 23:29:32 2005
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   ocp
-# Date created:		22 April 2005
-# Whom:			Emanuel Haupt <ehaupt at critical.ch>
+# New ports collection makefile for:	ocp
+# Date created:				22 April 2005
+# Whom:					Emanuel Haupt <ehaupt at critical.ch>
 #
 # $FreeBSD: ports/audio/ocp/Makefile,v 1.7 2005/07/29 08:55:37 vs Exp $
 #
 
 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 @@
 .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 -Nur ocp.orig/pkg-descr ocp/pkg-descr
--- ocp.orig/pkg-descr	Fri Jul 29 10:55:37 2005
+++ ocp/pkg-descr	Wed Sep 21 23:20:32 2005
@@ -7,9 +7,7 @@
 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 at critical.ch
--- ocp.patch ends here ---

--- libadplug.patch begins here ---
diff -Nur libadplug.orig/Makefile libadplug/Makefile
--- libadplug.orig/Makefile	Tue May 31 23:24:38 2005
+++ libadplug/Makefile	Wed Sep 21 23:15:53 2005
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   adplug
-# Date created:		10 August 2004
-# Whom:			Emanuel Haupt <ehaupt at critical.ch>
+# New ports collection makefile for:	libadplug
+# Date created:				10 August 2004
+# Whom:					Emanuel Haupt <ehaupt at critical.ch>
 #
 # $FreeBSD: ports/audio/libadplug/Makefile,v 1.3 2005/05/31 21:24:38 flz Exp $
 #
 
 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 @@
 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 -Nur libadplug.orig/pkg-descr libadplug/pkg-descr
--- libadplug.orig/pkg-descr	Mon May  9 22:18:50 2005
+++ libadplug/pkg-descr	Wed Sep 21 23:16:03 2005
@@ -10,6 +10,3 @@
 different systems available.
 
 WWW: http://adplug.sourceforge.net/
-
-- ehaupt
-ehaupt at critical.ch
--- libadplug.patch ends here ---

--- adplay.patch begins here ---
diff -Nur adplay.orig/Makefile adplay/Makefile
--- adplay.orig/Makefile	Tue May 31 23:24:38 2005
+++ adplay/Makefile	Wed Sep 21 23:15:25 2005
@@ -1,13 +1,13 @@
-# New ports collection makefile for:   adplay
-# Date created:		10 August 2004
-# Whom:			Emanuel Haupt <ehaupt at critical.ch>
+# New ports collection makefile for:	adplay
+# Date created:				10 August 2004
+# Whom:					Emanuel Haupt <ehaupt at critical.ch>
 #
 # $FreeBSD: ports/audio/adplay/Makefile,v 1.3 2005/05/31 21:24:38 flz Exp $
 #
 
 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 @@
 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 -Nur adplay.orig/pkg-descr adplay/pkg-descr
--- adplay.orig/pkg-descr	Mon May  9 22:22:21 2005
+++ adplay/pkg-descr	Wed Sep 21 23:15:32 2005
@@ -2,6 +2,3 @@
 many AdLib formats such as HSP and HSC.
 
 WWW: http://adplug.sourceforge.net/
-
-- ehaupt
-ehaupt at critical.ch
--- adplay.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

