Attachment #145146 for bug #192271




# $FreeBSD$

PORTNAME=	libcdio
PORTVERSION=	0.92
PORTREVISION=	2
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	libcdio

MAINTAINER=	arved@FreeBSD.org
COMMENT=	Compact Disc Input and Control Library

LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

GNU_CONFIGURE=	yes
USES=		pathfix pkgconfig iconv ncurses gmake perl5 libtool:keepla
USE_LDCONFIG=	yes
CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
USE_PERL5=	build

.include <bsd.port.pre.mk>

post-patch:
	${REINPLACE_CMD} -e 's|/jp/man1|/ja/man1|' \
		${WRKSRC}/src/cd-paranoia/doc/ja/Makefile.in
	${REINPLACE_CMD} -e "s,freebsd5\.\*,freebsd*," ${WRKSRC}/configure

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (libcdio-0.83.tar.gz) = 235017e3eccb86424f9c108f2c5d5fca62630bda8c9dcf23b425ba9c5e2482c0	1	SHA256 (libcdio-0.92.tar.gz) = 3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad
2	SIZE (libcdio-0.83.tar.gz) = 2323747	2	SIZE (libcdio-0.92.tar.gz) = 2710084




--- configure.ac.orig	2012-01-16 15:15:37.000000000 -0600
+++ configure.ac	2012-01-16 15:16:15.000000000 -0600
@@ -430,7 +430,7 @@
  	LT_NO_UNDEFINED="-no-undefined"
   	cd_drivers="${cd_drivers}, MinGW "
 	;;
-     freebsd4.*|freebsd5.*|freebsd6*|freebsd7*|freebsd8*|dragonfly*|kfreebsd*)
+     freebsd4.*|freebsd5.*|freebsd[6-9]*|freebsd10*|dragonfly*|kfreebsd*)
      	AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
                   [Define 1 if you have FreeBSD CD-ROM support])
  	LIBS="$LIBS -lcam"
--- configure.orig	2012-01-16 15:14:32.000000000 -0600
+++ configure	2012-01-16 15:15:26.000000000 -0600
@@ -16849,7 +16849,7 @@
  	LT_NO_UNDEFINED="-no-undefined"
   	cd_drivers="${cd_drivers}, MinGW "
 	;;
-     freebsd4.*|freebsd5.*|freebsd6*|freebsd7*|freebsd8*|dragonfly*|kfreebsd*)
+     freebsd4.*|freebsd5.*|freebsd[6-9]*|freebsd10*|dragonfly*|kfreebsd*)
 
 $as_echo "#define HAVE_FREEBSD_CDROM 1" >>confdefs.h
 




bin/cd-drive
bin/cd-info
bin/cd-paranoia
bin/cd-read
bin/cdda-player
bin/iso-info

include/cdio/bytesex.h
include/cdio/bytesex_asm.h
include/cdio/cd_types.h
include/cdio/cdda.h
include/cdio/cdio.h
include/cdio/cdio_config.h
include/cdio/cdio_unconfig.h
include/cdio/cdtext.h
include/cdio/device.h
include/cdio/disc.h

include/cdio/mmc_hl_cmds.h
include/cdio/mmc_ll_cmds.h
include/cdio/mmc_util.h
include/cdio/paranoia.h
include/cdio/posix.h
include/cdio/read.h
include/cdio/rock.h

lib/libcdio.a
lib/libcdio.la
lib/libcdio.so
lib/libcdio.so.15
lib/libcdio.so.15.0.0
lib/libcdio++.a
lib/libcdio++.la
lib/libcdio++.so
lib/libcdio++.so.0
lib/libcdio++.so.0.0.2
lib/libcdio_cdda.la
lib/libcdio_cdda.so
lib/libcdio_cdda.so.1
lib/libcdio_paranoia.a
lib/libcdio_paranoia.la
lib/libcdio_paranoia.so
lib/libcdio_paranoia.so.1
lib/libiso9660.a
lib/libiso9660.la
lib/libiso9660.so
lib/libiso9660.so.9
lib/libiso9660.so.9.0.0
lib/libiso9660++.a
lib/libiso9660++.la
lib/libiso9660++.so
lib/libiso9660++.so.0
lib/libiso9660++.so.0.0.0
lib/libudf.a
lib/libudf.la
lib/libudf.so
lib/libudf.so.0
lib/libudf.so.0.0.0
libdata/pkgconfig/libcdio.pc
libdata/pkgconfig/libcdio_cdda.pc
libdata/pkgconfig/libcdio_paranoia.pc
libdata/pkgconfig/libudf.pc
libdata/pkgconfig/libcdio++.pc
libdata/pkgconfig/libiso9660++.pc
libdata/pkgconfig/libiso9660.pc
man/ja/man1/cd-paranoia.1.gz
man/man1/cd-drive.1.gz
man/man1/cd-info.1.gz
man/man1/cd-paranoia.1.gz
man/man1/cd-read.1.gz
man/man1/iso-info.1.gz
man/man1/iso-read.1.gz

Return to bug 192271

Lines 2-9 Link Here

(-)Makefile (-7 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libcdio	4	PORTNAME= libcdio
5	PORTVERSION= 0.83	5	PORTVERSION= 0.92
6	PORTREVISION= 2
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= ${MASTER_SITE_GNU}	7	MASTER_SITES= ${MASTER_SITE_GNU}
9	MASTER_SITE_SUBDIR= libcdio	8	MASTER_SITE_SUBDIR= libcdio
Lines 11-24 Link Here
11	MAINTAINER= arved@FreeBSD.org	10	MAINTAINER= arved@FreeBSD.org
12	COMMENT= Compact Disc Input and Control Library	11	COMMENT= Compact Disc Input and Control Library
13		12
14	LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb \	13	LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb
15	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
16		14
17	LICENSE= GPLv3	15	LICENSE= GPLv3
18	LICENSE_FILE= ${WRKSRC}/COPYING	16	LICENSE_FILE= ${WRKSRC}/COPYING
19		17
20	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
21	USES= pathfix pkgconfig iconv ncurses gmake perl5	19	USES= pathfix pkgconfig iconv ncurses gmake perl5 libtool:keepla
22	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
23	CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}	21	CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
24	USE_PERL5= build	22	USE_PERL5= build
Lines 30-37 Link Here
30	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
31		29
32	post-patch:	30	post-patch:
33	${REINPLACE_CMD} -e 's\|/jp/man1\|/ja/man1\|' \
34	${WRKSRC}/src/cd-paranoia/doc/ja/Makefile.in
35	${REINPLACE_CMD} -e "s,freebsd5\.\,freebsd," ${WRKSRC}/configure	31	${REINPLACE_CMD} -e "s,freebsd5\.\,freebsd," ${WRKSRC}/configure
36		32
37	.include <bsd.port.post.mk>	33	.include <bsd.port.post.mk>

Lines 1-22 Link Here

(-)files/patch-configure (-22 lines)
1	--- configure.ac.orig 2012-01-16 15:15:37.000000000 -0600
2	+++ configure.ac 2012-01-16 15:16:15.000000000 -0600
3	@@ -430,7 +430,7 @@
4	LT_NO_UNDEFINED="-no-undefined"
5	cd_drivers="${cd_drivers}, MinGW "
6	;;
7	- freebsd4.\|freebsd5.\|freebsd6\|freebsd7\|freebsd8\|dragonfly\|kfreebsd*)
8	+ freebsd4.\|freebsd5.\|freebsd[6-9]\|freebsd10\|dragonfly\|kfreebsd)
9	AC_DEFINE([HAVE_FREEBSD_CDROM], [1],
10	[Define 1 if you have FreeBSD CD-ROM support])
11	LIBS="$LIBS -lcam"
12	--- configure.orig 2012-01-16 15:14:32.000000000 -0600
13	+++ configure 2012-01-16 15:15:26.000000000 -0600
14	@@ -16849,7 +16849,7 @@
15	LT_NO_UNDEFINED="-no-undefined"
16	cd_drivers="${cd_drivers}, MinGW "
17	;;
18	- freebsd4.\|freebsd5.\|freebsd6\|freebsd7\|freebsd8\|dragonfly\|kfreebsd*)
19	+ freebsd4.\|freebsd5.\|freebsd[6-9]\|freebsd10\|dragonfly\|kfreebsd)
20
21	$as_echo "#define HAVE_FREEBSD_CDROM 1" >>confdefs.h
22

Lines 1-6 Link Here

(-)pkg-plist (-18 / +7 lines)
1	bin/cd-drive	1	bin/cd-drive
2	bin/cd-info	2	bin/cd-info
3	bin/cd-paranoia
4	bin/cd-read	3	bin/cd-read
5	bin/cdda-player	4	bin/cdda-player
6	bin/iso-info	5	bin/iso-info
Lines 10-19 Link Here
10	include/cdio/bytesex.h	9	include/cdio/bytesex.h
11	include/cdio/bytesex_asm.h	10	include/cdio/bytesex_asm.h
12	include/cdio/cd_types.h	11	include/cdio/cd_types.h
13	include/cdio/cdda.h
14	include/cdio/cdio.h	12	include/cdio/cdio.h
15	include/cdio/cdio_config.h	13	include/cdio/cdio_config.h
16	include/cdio/cdio_unconfig.h
17	include/cdio/cdtext.h	14	include/cdio/cdtext.h
18	include/cdio/device.h	15	include/cdio/device.h
19	include/cdio/disc.h	16	include/cdio/disc.h
Lines 27-33 Link Here
27	include/cdio/mmc_hl_cmds.h	24	include/cdio/mmc_hl_cmds.h
28	include/cdio/mmc_ll_cmds.h	25	include/cdio/mmc_ll_cmds.h
29	include/cdio/mmc_util.h	26	include/cdio/mmc_util.h
30	include/cdio/paranoia.h
31	include/cdio/posix.h	27	include/cdio/posix.h
32	include/cdio/read.h	28	include/cdio/read.h
33	include/cdio/rock.h	29	include/cdio/rock.h
Lines 54-95 Link Here
54	lib/libcdio.a	50	lib/libcdio.a
55	lib/libcdio.la	51	lib/libcdio.la
56	lib/libcdio.so	52	lib/libcdio.so
57	lib/libcdio.so.13	53	lib/libcdio.so.15
		54	lib/libcdio.so.15.0.0
58	lib/libcdio++.a	55	lib/libcdio++.a
59	lib/libcdio++.la	56	lib/libcdio++.la
60	lib/libcdio++.so	57	lib/libcdio++.so
61	lib/libcdio++.so.0	58	lib/libcdio++.so.0
62	lib/libcdio_cdda.a	59	lib/libcdio++.so.0.0.2
63	lib/libcdio_cdda.la
64	lib/libcdio_cdda.so
65	lib/libcdio_cdda.so.1
66	lib/libcdio_paranoia.a
67	lib/libcdio_paranoia.la
68	lib/libcdio_paranoia.so
69	lib/libcdio_paranoia.so.1
70	lib/libiso9660.a	60	lib/libiso9660.a
71	lib/libiso9660.la	61	lib/libiso9660.la
72	lib/libiso9660.so	62	lib/libiso9660.so
73	lib/libiso9660.so.8	63	lib/libiso9660.so.9
		64	lib/libiso9660.so.9.0.0
74	lib/libiso9660++.a	65	lib/libiso9660++.a
75	lib/libiso9660++.la	66	lib/libiso9660++.la
76	lib/libiso9660++.so	67	lib/libiso9660++.so
77	lib/libiso9660++.so.0	68	lib/libiso9660++.so.0
		69	lib/libiso9660++.so.0.0.0
78	lib/libudf.a	70	lib/libudf.a
79	lib/libudf.la	71	lib/libudf.la
80	lib/libudf.so	72	lib/libudf.so
81	lib/libudf.so.0	73	lib/libudf.so.0
		74	lib/libudf.so.0.0.0
82	libdata/pkgconfig/libcdio.pc	75	libdata/pkgconfig/libcdio.pc
83	libdata/pkgconfig/libcdio_cdda.pc
84	libdata/pkgconfig/libcdio_paranoia.pc
85	libdata/pkgconfig/libudf.pc	76	libdata/pkgconfig/libudf.pc
86	libdata/pkgconfig/libcdio++.pc	77	libdata/pkgconfig/libcdio++.pc
87	libdata/pkgconfig/libiso9660++.pc	78	libdata/pkgconfig/libiso9660++.pc
88	libdata/pkgconfig/libiso9660.pc	79	libdata/pkgconfig/libiso9660.pc
89	man/ja/man1/cd-paranoia.1.gz
90	man/man1/cd-drive.1.gz	80	man/man1/cd-drive.1.gz
91	man/man1/cd-info.1.gz	81	man/man1/cd-info.1.gz
92	man/man1/cd-paranoia.1.gz
93	man/man1/cd-read.1.gz	82	man/man1/cd-read.1.gz
94	man/man1/iso-info.1.gz	83	man/man1/iso-info.1.gz
95	man/man1/iso-read.1.gz	84	man/man1/iso-read.1.gz