Date: Mon, 26 Jun 2000 01:07:13 +0900 (JST) From: futatuki@debug.gr.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/19504: cdrdao port Message-ID: <200006251607.BAA13429@galient.yf.bsdclub.org>
next in thread | raw e-mail | index | archive | help
>Number: 19504
>Category: ports
>Synopsis: cdrdao port
>Confidential: yes
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 25 09:10:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Yasuhito FUTATSUKI (cdrdao port maintainer)
>Release: FreeBSD 3.5-STABLE i386
>Organization:
DEBUG -- A BSD users' group of south Ibaraki area
>Environment:
FreeBSD 3-STABLE, FreeBSD 5-CURRENT
>Description:
Xcdrdao cannot be built with GTK-- 1.2.0 because of its incompatibility
with GTK-- 1.0.3. However, current cdrdao port tries to build xcdrdao
when package building or set XCDRDAO variable yes, or GTK-- is already
installed, and fail to build.
>How-To-Repeat:
cd /usr/ports/audio/cdrdao && make XCDRDAO=yes
>Fix:
I think xcdrdao port shuold be separated from cdrdao port. So I cut off
xcdrdao feature from cdrdao port.
Here is a patch against current cdrdao port. It do:
* cut off xcdrdao
* support 5-current
* do not use posix-threads by default (because of thread scheduling problem)
* change my E-Mail address in pkg/DESCR
removed files:
pkg/PLIST.xcdrdao
changed files:
Makefile
patches/patch-ac
pkg/DESCR
BEGIN --- cut here --- cut here --- cut here --- cut here ---
diff -urN cdrdao.orig/Makefile cdrdao/Makefile
--- cdrdao.orig/Makefile Sat Jun 24 09:51:23 2000
+++ cdrdao/Makefile Sun Jun 25 02:28:20 2000
@@ -2,7 +2,7 @@
# Date created: 7 April 1999
# Whom: futatuki
#
-# $FreeBSD: ports/audio/cdrdao/Makefile,v 1.17 2000/05/28 03:20:42 steve Exp $
+# $FreeBSD$
#
PORTNAME= cdrdao
@@ -24,41 +24,20 @@
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/include/gtk--.h)
-XCDRDAO= yes
-.endif
-
-.if defined(PACKAGE_BUILDING)
-XCDRDAO= yes
-.endif
-
-.if defined(XCDRDAO)
-USE_NEWGCC= yes
-LIB_DEPENDS+= gtkmm-1.2:${PORTSDIR}/x11-toolkits/gtk--
-MAN1+= xcdrdao.1
-PLIST=${PKGDIR}/PLIST.xcdrdao
-.else
CONFIGURE_ARGS= --disable-gtkmmtest
-.endif
.if defined(WITHOUT_SCGLIB) && ${OSVERSION} > 300000
CONFIGURE_ARGS+= --without-scglib
.endif
-.if defined(WITHOUT_PTHREADS) && ${OSVERSION} > 320000
+.if !defined(WITH_PTHREADS) && ${OSVERSION} > 320000
CONFIGURE_ARGS+= --without-posix-threads
.endif
pre-fetch:
@${ECHO_MSG} "If you don't want to use Joerg Schilling's SCSI library,"
@${ECHO_MSG} "set WITHOUT_SCGLIB=yes."
- @${ECHO_MSG} "If you don't want to use pthreads, set WITHOUT_PTHREADS=yes."
-.if !defined(XCDRDAO)
- @${ECHO_MSG} "To build the graphical X toc file editor, xcdrdao, type:"
- @${ECHO_MSG} " make XCDRDAO=yes."
-.else
- @${ECHO_MSG} "Building with xcdrdao"
-.endif
+ @${ECHO_MSG} "If you want to use pthreads, set WITH_PTHREADS=yes."
.if ${MACHINE_ARCH} == "alpha"
post-extract:
@@ -68,9 +47,6 @@
post-install:
strip $(PREFIX)/bin/cdrdao
-.if defined(XCDRDAO)
- strip $(PREFIX)/bin/xcdrdao
-.endif
@${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
diff -urN cdrdao.orig/patches/patch-ac cdrdao/patches/patch-ac
--- cdrdao.orig/patches/patch-ac Wed Oct 27 03:37:58 1999
+++ cdrdao/patches/patch-ac Sun Jun 25 02:24:14 2000
@@ -1,6 +1,44 @@
--- configure.orig Wed Oct 27 01:13:45 1999
-+++ configure Wed Oct 27 03:29:33 1999
-@@ -2945,7 +2945,7 @@
++++ configure Fri Jun 23 08:40:42 2000
+@@ -2592,6 +2592,8 @@
+ { echo "configure: error: No PCCTS installation detected." 1>&2; exit 1; }
+ fi
+
++# Disable xcdrdao feature (temporary)
++if false ; then
+ # Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given.
+ if test "${with_gtkmm_prefix+set}" = set; then
+ withval="$with_gtkmm_prefix"
+@@ -2869,8 +2871,8 @@
+
+
+ rm -f conf.gtkmmtest
+-
+-
++# End Disable xcdrdao feature (temporary)
++fi
+
+
+ if test "$use_scglib" = default; then
+@@ -2897,7 +2899,7 @@
+ scsi_if_src=ScsiIf-lib.cc
+
+ case "$host" in
+- *-freebsd3* | *-freebsd4*)
++ *-freebsd3* | *-freebsd4* | *-freebsd5*)
+ scsilib_libs="$scsilib_libs -lcam"
+ ;;
+ esac
+@@ -2913,7 +2915,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"
+ ;;
+@@ -2945,7 +2947,7 @@
esac
case "$host" in
diff -urN cdrdao.orig/pkg/DESCR cdrdao/pkg/DESCR
--- cdrdao.orig/pkg/DESCR Sun May 23 11:34:08 1999
+++ cdrdao/pkg/DESCR Sun Jun 25 02:29:46 2000
@@ -10,4 +10,4 @@
WWW: http://www.ping.de/sites/daneb/cdrdao.html
- -- Yasuhito FUTATSUKI <futatuki@fureai.or.jp>
+ -- Yasuhito FUTATSUKI <futatuki@debug.gr.jp>
diff -urN cdrdao.orig/pkg/PLIST.xcdrdao cdrdao/pkg/PLIST.xcdrdao
--- cdrdao.orig/pkg/PLIST.xcdrdao Wed Oct 27 03:52:06 1999
+++ cdrdao/pkg/PLIST.xcdrdao Thu Jan 1 09:00:00 1970
@@ -1,12 +0,0 @@
-bin/cdrdao
-bin/xcdrdao
-share/doc/cdrdao/COPYING
-share/doc/cdrdao/CREDITS
-share/doc/cdrdao/INSTALL
-share/doc/cdrdao/README
-share/doc/cdrdao/README.FreeBSD
-share/doc/cdrdao/README.PlexDAE
-share/doc/cdrdao/Release-1.1.0
-share/doc/cdrdao/Release-1.1.2
-share/doc/cdrdao/Release-1.1.3
-@dirrm share/doc/cdrdao
END --- cut here --- cut here --- cut here --- cut here ---
>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?200006251607.BAA13429>