diff options
author | Motoyuki Konno <motoyuki@FreeBSD.org> | 2000-06-30 15:43:39 +0000 |
---|---|---|
committer | Motoyuki Konno <motoyuki@FreeBSD.org> | 2000-06-30 15:43:39 +0000 |
commit | 7ce27e9936155e0ab934de694cf371989363f914 (patch) | |
tree | c5f718f2531dac565f1c41a468b560ad8d371742 /audio | |
parent | New port of smapi - a Squish MSGAPI which can be used to access Squish format (diff) |
o Turn off the build of xcdrdao:
Xcdrdao cannot build with GTK-- 1.2.0 bacause of the incompatibility
of GTK--. If GTK-- is installed, cdrdao port always tries to build
xcdrdao, and fails.
o Support 5-current.
o Do not use posix-threads by default due to thread scheduling problem.
o Change the address of maintainer.
PR: ports/19504
Submitted by: Yasuhito FUTATSUKI <futatuki@debug.gr.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=30029
Diffstat (limited to 'audio')
-rw-r--r-- | audio/cdrdao/Makefile | 28 | ||||
-rw-r--r-- | audio/cdrdao/files/patch-ac | 42 | ||||
-rw-r--r-- | audio/cdrdao/pkg-descr | 2 |
3 files changed, 43 insertions, 29 deletions
diff --git a/audio/cdrdao/Makefile b/audio/cdrdao/Makefile index 8b2dfb7cf6b8..a3c5f3acc742 100644 --- a/audio/cdrdao/Makefile +++ b/audio/cdrdao/Makefile @@ -24,41 +24,20 @@ MAN1= cdrdao.1 .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-extract: 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 --git a/audio/cdrdao/files/patch-ac b/audio/cdrdao/files/patch-ac index 40d2dea2e860..9fc888409e77 100644 --- a/audio/cdrdao/files/patch-ac +++ b/audio/cdrdao/files/patch-ac @@ -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 --git a/audio/cdrdao/pkg-descr b/audio/cdrdao/pkg-descr index 21f97f24190d..d5007f5b118f 100644 --- a/audio/cdrdao/pkg-descr +++ b/audio/cdrdao/pkg-descr @@ -10,4 +10,4 @@ Cdrdao requires kernel with "options SYSVSHM" and "options SYSVMSG". WWW: http://www.ping.de/sites/daneb/cdrdao.html - -- Yasuhito FUTATSUKI <futatuki@fureai.or.jp> + -- Yasuhito FUTATSUKI <futatuki@debug.gr.jp> |