Date: Sat, 12 Oct 2002 04:11:34 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/43960: Update port: audio/cdrdao to 1.1.7 Message-ID: <200210121111.g9CBBYB1017495@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 43960
>Category: ports
>Synopsis: Update port: audio/cdrdao to 1.1.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 12 04:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.7
New file:
files/patch-configure
files/patch-xdao::SoundIF-linux.cc
Remove file:
files/patch-ac
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/cdrdao/Makefile audio/cdrdao/Makefile
--- /usr/ports/audio/cdrdao/Makefile Mon Sep 30 20:49:18 2002
+++ audio/cdrdao/Makefile Sat Oct 12 18:15:34 2002
@@ -6,10 +6,10 @@
#
PORTNAME= cdrdao
-PORTVERSION= 1.1.5
+PORTVERSION= 1.1.7
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cdrdao
+MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= ports@FreeBSD.org
@@ -17,16 +17,18 @@
BUILD_DEPENDS= antlr:${PORTSDIR}/devel/pccts \
dlg:${PORTSDIR}/devel/pccts
-IGNORE= "Project frozen because of License issues. See http://cdrdao.sourceforge.net/news.html for detail"
-
-GNU_CONFIGURE= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
+GNU_CONFIGURE= yes
MAN1= cdrdao.1
.include <bsd.port.pre.mk>
-CONFIGURE_ARGS= --disable-gtkmmtest --with-pcctsbin=${LOCALBASE}/bin \
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --with-lame=no \
+ --with-gtkmm-prefix=${NONEXISTENT} \
+ --with-pcctsbin=${LOCALBASE}/bin \
--with-pcctsinc=${LOCALBASE}/include/pccts
.if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000
@@ -37,10 +39,13 @@
CONFIGURE_ARGS+= --without-posix-threads
.endif
-pre-fetch:
+pre-everything:
+ @${ECHO_MSG} ""
@${ECHO_MSG} "If you don't want to use Joerg Schilling's SCSI library,"
@${ECHO_MSG} "set WITHOUT_SCGLIB=yes."
+ @${ECHO_MSG} ""
@${ECHO_MSG} "If you want to use pthreads, set WITH_PTHREADS=yes."
+ @${ECHO_MSG} ""
post-extract:
.if ${MACHINE_ARCH} == "alpha"
@@ -49,13 +54,18 @@
.endif
@${CP} ${FILESDIR}/getopt.h ${WRKSRC}/utils
+post-patch:
+ @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+
post-install:
- strip ${PREFIX}/bin/cdrdao
- @${INSTALL_PROGRAM} -s ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/share/doc/cdrdao
-.for i in COPYING CREDITS INSTALL README README.FreeBSD README.PlexDAE \
- Release-1.1.0 Release-1.1.2 Release-1.1.3 Release-1.1.4
- @${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/cdrdao/
+.for i in cdrdao toc2cue
+ @${STRIP_CMD} ${PREFIX}/bin/${i}
+.endfor
+ @${MKDIR} ${DOCSDIR}
+.for i in CREDITS INSTALL README README.FreeBSD README.PlexDAE \
+ Release-1.1.0 Release-1.1.2 Release-1.1.3 Release-1.1.4 \
+ Release-1.1.5 Release-1.1.6 Release-1.1.7
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
@${CAT} ${PKGMESSAGE}
diff -urN /usr/ports/audio/cdrdao/distinfo audio/cdrdao/distinfo
--- /usr/ports/audio/cdrdao/distinfo Sun May 27 21:48:35 2001
+++ audio/cdrdao/distinfo Sat Oct 12 17:29:32 2002
@@ -1 +1 @@
-MD5 (cdrdao-1.1.5.src.tar.gz) = 482da7ab61ae29f98072e3c3e1e012aa
+MD5 (cdrdao-1.1.7.src.tar.gz) = 766a534137f2c6e99ab771e3178793f8
diff -urN /usr/ports/audio/cdrdao/files/patch-ac audio/cdrdao/files/patch-ac
--- /usr/ports/audio/cdrdao/files/patch-ac Sun May 27 21:48:45 2001
+++ audio/cdrdao/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,84 +0,0 @@
-diff -rc ../old/cdrdao-1.1.4/configure ./configure
-*** ../old/cdrdao-1.1.4/configure Sun Aug 27 13:37:08 2000
---- ./configure Fri Oct 20 10:32:47 2000
-***************
-*** 3234,3239 ****
---- 3234,3240 ----
-
-
-
-+ xdao=no
-
- if test $xdao != xdao; then
- xdao=
-***************
-*** 3263,3269 ****
- scsi_if_src=ScsiIf-lib.cc
-
- case "$host" in
-! *-freebsd3* | *-freebsd4*)
- scsilib_libs="$scsilib_libs -lcam"
- ;;
- esac
---- 3264,3270 ----
- scsi_if_src=ScsiIf-lib.cc
-
- case "$host" in
-! *-freebsd3* | *-freebsd4* | *-freebsd5*)
- scsilib_libs="$scsilib_libs -lcam"
- ;;
- esac
-***************
-*** 3279,3285 ****
- scsi_if_src="ScsiIf-linux.cc sg_err.cc"
- ;;
-
-! *-freebsd3* | *-freebsd4*)
- scsi_if_src="ScsiIf-freebsd-cam.cc"
- scsilib_libs="-lcam"
- ;;
---- 3280,3286 ----
- scsi_if_src="ScsiIf-linux.cc sg_err.cc"
- ;;
-
-! *-freebsd3* | *-freebsd4* | *-freebsd5*)
- scsi_if_src="ScsiIf-freebsd-cam.cc"
- scsilib_libs="-lcam"
- ;;
-***************
-*** 3311,3317 ****
- esac
-
- case "$host" in
-! *-linux-*)
- sound_if_src=SoundIF-linux.cc
- ;;
-
---- 3312,3318 ----
- esac
-
- case "$host" in
-! *-linux-* | *-freebsd*)
- sound_if_src=SoundIF-linux.cc
- ;;
-
-diff -rc ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc ./xdao/SoundIF-linux.cc
-*** ../old/cdrdao-1.1.4/xdao/SoundIF-linux.cc Sun Aug 27 13:37:11 2000
---- ./xdao/SoundIF-linux.cc Fri Oct 20 10:32:22 2000
-***************
-*** 34,40 ****
---- 34,47 ----
- *
- */
-
-+ # if defined(__FreeBSD__)
-+ #include <machine/soundcard.h>
-+ # if !defined(SNDCTL_DSP_CHANNELS)
-+ # define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
-+ # endif
-+ # else
- #include <linux/soundcard.h>
-+ # endif
-
- #include <stdio.h>
- #include <assert.h>
diff -urN /usr/ports/audio/cdrdao/files/patch-configure audio/cdrdao/files/patch-configure
--- /usr/ports/audio/cdrdao/files/patch-configure Thu Jan 1 09:00:00 1970
+++ audio/cdrdao/files/patch-configure Sat Oct 12 18:26:38 2002
@@ -0,0 +1,29 @@
+--- configure.orig Mon Oct 7 03:53:55 2002
++++ configure Sat Oct 12 18:06:18 2002
+@@ -6107,7 +6107,7 @@
+ scsi_if_src=ScsiIf-lib.cc
+
+ case "$host" in
+- *-freebsd3* | *-freebsd4*)
++ *-freebsd3* | *-freebsd4* | *-freebsd5* )
+ scsilib_libs="$scsilib_libs -lcam"
+ ;;
+ esac
+@@ -6123,7 +6123,7 @@
+ scsi_if_src="ScsiIf-linux.cc sg_err.cc"
+ ;;
+
+- *-freebsd3* | *-freebsd4*)
++ *-freebsd3* | *-freebsd4* | *-freebsd5* )
+ scsi_if_src="ScsiIf-freebsd-cam.cc"
+ scsilib_libs="-lcam"
+ ;;
+@@ -6164,7 +6164,7 @@
+ esac
+
+ case "$host" in
+- *-linux-*)
++ *-linux-* | *-freebsd* )
+ sound_if_src=SoundIF-linux.cc
+ ;;
+
diff -urN /usr/ports/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc audio/cdrdao/files/patch-xdao::SoundIF-linux.cc
--- /usr/ports/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc Thu Jan 1 09:00:00 1970
+++ audio/cdrdao/files/patch-xdao::SoundIF-linux.cc Sat Oct 12 17:32:26 2002
@@ -0,0 +1,17 @@
+--- xdao/SoundIF-linux.cc.orig Mon Oct 7 03:53:56 2002
++++ xdao/SoundIF-linux.cc Sat Oct 12 17:32:10 2002
+@@ -34,7 +34,14 @@
+ *
+ */
+
++# if defined(__FreeBSD__)
++#include <sys/soundcard.h>
++# if !defined(SNDCTL_DSP_CHANNELS)
++# define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
++# endif
++# else
+ #include <linux/soundcard.h>
++# endif
+
+ #include <stdio.h>
+ #include <assert.h>
diff -urN /usr/ports/audio/cdrdao/pkg-plist audio/cdrdao/pkg-plist
--- /usr/ports/audio/cdrdao/pkg-plist Sun Jul 8 16:25:53 2001
+++ audio/cdrdao/pkg-plist Sat Oct 12 17:59:48 2002
@@ -1,7 +1,6 @@
bin/cdrdao
bin/toc2cue
share/cdrdao/drivers
-%%PORTDOCS%%share/doc/cdrdao/COPYING
%%PORTDOCS%%share/doc/cdrdao/CREDITS
%%PORTDOCS%%share/doc/cdrdao/INSTALL
%%PORTDOCS%%share/doc/cdrdao/README
@@ -11,5 +10,8 @@
%%PORTDOCS%%share/doc/cdrdao/Release-1.1.2
%%PORTDOCS%%share/doc/cdrdao/Release-1.1.3
%%PORTDOCS%%share/doc/cdrdao/Release-1.1.4
-@dirrm share/cdrdao
+%%PORTDOCS%%share/doc/cdrdao/Release-1.1.5
+%%PORTDOCS%%share/doc/cdrdao/Release-1.1.6
+%%PORTDOCS%%share/doc/cdrdao/Release-1.1.7
%%PORTDOCS%%@dirrm share/doc/cdrdao
+@dirrm share/cdrdao
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210121111.g9CBBYB1017495>