aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2002-10-12 23:48:17 +0800
committerijliao <ijliao@FreeBSD.org>2002-10-12 23:48:17 +0800
commitf154a18938bc7709a86ebb286d0192e1459e6d25 (patch)
tree1826154862ae45698848867d43f122e1ffff0afd
parentd6633838e0d894a1fff95bf88348ca29f663a94c (diff)
downloadfreebsd-ports-gnome-f154a18938bc7709a86ebb286d0192e1459e6d25.tar.gz
freebsd-ports-gnome-f154a18938bc7709a86ebb286d0192e1459e6d25.tar.zst
freebsd-ports-gnome-f154a18938bc7709a86ebb286d0192e1459e6d25.zip
upgrade to 1.1.7
PR: 43960 Submitted by: Ports Fury
-rw-r--r--audio/cdrdao/Makefile36
-rw-r--r--audio/cdrdao/distinfo2
-rw-r--r--audio/cdrdao/files/patch-ac84
-rw-r--r--audio/cdrdao/files/patch-configure29
-rw-r--r--audio/cdrdao/files/patch-xdao::SoundIF-linux.cc17
-rw-r--r--audio/cdrdao/pkg-plist6
-rw-r--r--sysutils/cdrdao/Makefile36
-rw-r--r--sysutils/cdrdao/distinfo2
-rw-r--r--sysutils/cdrdao/files/patch-ac84
-rw-r--r--sysutils/cdrdao/files/patch-configure29
-rw-r--r--sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc17
-rw-r--r--sysutils/cdrdao/pkg-plist6
12 files changed, 148 insertions, 200 deletions
diff --git a/audio/cdrdao/Makefile b/audio/cdrdao/Makefile
index b4398a68b9dc..655241ae3a7d 100644
--- a/audio/cdrdao/Makefile
+++ b/audio/cdrdao/Makefile
@@ -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 @@ MAINTAINER= ports@FreeBSD.org
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-scglib
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 @@ post-extract:
.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 --git a/audio/cdrdao/distinfo b/audio/cdrdao/distinfo
index 3d06fbd5a5f2..78550ab17ca1 100644
--- a/audio/cdrdao/distinfo
+++ b/audio/cdrdao/distinfo
@@ -1 +1 @@
-MD5 (cdrdao-1.1.5.src.tar.gz) = 482da7ab61ae29f98072e3c3e1e012aa
+MD5 (cdrdao-1.1.7.src.tar.gz) = 766a534137f2c6e99ab771e3178793f8
diff --git a/audio/cdrdao/files/patch-ac b/audio/cdrdao/files/patch-ac
deleted file mode 100644
index d7f69061adf8..000000000000
--- a/audio/cdrdao/files/patch-ac
+++ /dev/null
@@ -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 --git a/audio/cdrdao/files/patch-configure b/audio/cdrdao/files/patch-configure
new file mode 100644
index 000000000000..100da928fe04
--- /dev/null
+++ b/audio/cdrdao/files/patch-configure
@@ -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 --git a/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc b/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc
new file mode 100644
index 000000000000..ab7b04f65292
--- /dev/null
+++ b/audio/cdrdao/files/patch-xdao::SoundIF-linux.cc
@@ -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 --git a/audio/cdrdao/pkg-plist b/audio/cdrdao/pkg-plist
index 4274be52974b..36ddd43eea11 100644
--- a/audio/cdrdao/pkg-plist
+++ b/audio/cdrdao/pkg-plist
@@ -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 @@ share/cdrdao/drivers
%%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
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index b4398a68b9dc..655241ae3a7d 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -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 @@ MAINTAINER= ports@FreeBSD.org
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-scglib
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 @@ post-extract:
.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 --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 3d06fbd5a5f2..78550ab17ca1 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1 +1 @@
-MD5 (cdrdao-1.1.5.src.tar.gz) = 482da7ab61ae29f98072e3c3e1e012aa
+MD5 (cdrdao-1.1.7.src.tar.gz) = 766a534137f2c6e99ab771e3178793f8
diff --git a/sysutils/cdrdao/files/patch-ac b/sysutils/cdrdao/files/patch-ac
deleted file mode 100644
index d7f69061adf8..000000000000
--- a/sysutils/cdrdao/files/patch-ac
+++ /dev/null
@@ -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 --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure
new file mode 100644
index 000000000000..100da928fe04
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-configure
@@ -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 --git a/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
new file mode 100644
index 000000000000..ab7b04f65292
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-xdao::SoundIF-linux.cc
@@ -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 --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index 4274be52974b..36ddd43eea11 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -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 @@ share/cdrdao/drivers
%%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