3 files changed, 43 insertions, 55 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 1a3c9ddbbe32..7dd354c4c245 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -18,16 +18,18 @@
 ###########################################################################
 
 PORTNAME=	cdrtools
-PORTVERSION=	3.01a23
+PORTVERSION=	3.01a24
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
-MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/alpha/ \
-		http://ftp.berlios.de/pub/cdrecord/alpha/ \
-		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=${PORTNAME}/alpha
 
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	CD/DVD/BluRay and ISO-9660 image creation and extraction tools
 
+LICENSE=	BSD2CLAUSE CDDL GPLv2 LGPL21
+LICENSE_COMB=	multi
+
 CONFLICTS=	cdrkit-* cdrtools-[0-9]* cjk-cdrtools-*
 
 DOCS=		README.FreeBSD README.mkisofs
@@ -55,19 +57,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME:C/a(.+)$//}
 SUB_FILES=	pkg-message
 MAKE_JOBS_UNSAFE=	yes
 
-.if defined(WITH_CDDA2MP3)
+OPTIONS_DEFINE=	CDDA2MP3 CDDA2OGG DOCS NLS RSCSI
+
+CDDA2MP3_DESC=	Build cdda2mp3 (requires audio/lame)
+CDDA2OGG_DESC=	Build cdda2ogg (requires audio/vorbis-tools)
+RSCSI_DESC=	Build rscsi suid root remote SCSI access daemon
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCDDA2MP3}
 PLIST_SUB+=	CDDA2MP3=""
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .else
 PLIST_SUB+=	CDDA2MP3="@comment "
 .endif
-.if defined(WITH_CDDA2OGG)
+.if ${PORT_OPTIONS:MCDDA2OGG}
 PLIST_SUB+=	CDDA2OGG=""
 RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
 .else
 PLIST_SUB+=	CDDA2OGG="@comment "
 .endif
-.if defined(WITH_RSCSI)
+.if ${PORT_OPTIONS:MRSCSI}
 PKGINSTALL=	${PKGDIR}/pkg-install.rscsi
 PLIST_SUB+=	RSCSI=""
 PKGNAMESUFFIX=	-rscsi-devel
@@ -80,38 +90,12 @@ MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
 		INS_RBASE=${LOCALBASE}
 CDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
 
-
-OPTIONS_DEFINE=	DOCS NLS
-
-.include <bsd.port.options.mk>
-
 .if exists(/usr/include/iconv.h) || exists(${LOCALBASE}/lib/libiconv.a) || \
 	exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS}
 MAKE_ENV+=	DEFOSINCDIRS=${LOCALBASE}/include LDPATH=-L${LOCALBASE}/lib
 USES+=		gettext iconv
 .endif
 
-pre-everything::
-.if !defined(WITH_CDDA2MP3) || !defined(CDDA2OGG) || !defined(WITH_RSCSI)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build option(s):"
-	@${ECHO_MSG} ""
-.if !defined(WITH_CDDA2MP3)
-	@${ECHO_MSG} "WITH_CDDA2MP3=yes	builds with cdda2mp3 (requires audio/lame)"
-.endif
-.if !defined(WITH_CDDA2OGG)
-	@${ECHO_MSG} "WITH_CDDA2OGG=yes	builds with cdda2ogg (requires audio/vorbis-tools)"
-.endif
-.if !defined(WITH_RSCSI)
-	@${ECHO_MSG} "WITH_RSCSI=yes		builds with the rscsi daemon which provides access to"
-	@${ECHO_MSG} "			local SCSI-devices over the network (the client-side"
-	@${ECHO_MSG} "			in cdda2wav, cdrecord, etc. is built unconditionally)."
-	@${ECHO_MSG} "			BEWARE:	The rscsi binary will be installed suid root"
-	@${ECHO_MSG} "				as this is the preferred way of setting it up."
-.endif
-	@${ECHO_MSG} ""
-.endif
-
 post-extract:
 .for i in config.guess config.sub
 .for j in autoconf conf cdda2wav
@@ -125,7 +109,7 @@ post-extract:
 
 post-patch:
 	@${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man
-.if !defined(WITH_RSCSI)
+.if !${PORT_OPTIONS:MRSCSI}
 	@${RM} ${WRKSRC}/TARGETS/55rscsi
 .endif
 .for i in btcflash/btcflash.1 cdda2wav/cdda2mp3 cdda2wav/cdda2ogg \
@@ -153,12 +137,12 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/btcflash/OBJ/${CDRTLSTARGET}/btcflash \
 		${STAGEDIR}${PREFIX}/bin
-.if defined(WITH_CDDA2MP3)
+.if ${PORT_OPTIONS:MCDDA2MP3}
 	${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2mp3 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \
 		${STAGEDIR}${PREFIX}/man/man1/cdda2mp3.1
 .endif
-.if defined(WITH_CDDA2OGG)
+.if ${PORT_OPTIONS:MCDDA2OGG}
 	${INSTALL_SCRIPT} ${WRKSRC}/cdda2wav/cdda2ogg ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cdda2wav/cdda2ogg.1 \
 		${STAGEDIR}${PREFIX}/man/man1
@@ -177,7 +161,7 @@ do-install:
 	${LN} -sf mkisofs ${STAGEDIR}${PREFIX}/bin/mkhybrid
 	${INSTALL_PROGRAM} ${WRKSRC}/readcd/OBJ/${CDRTLSTARGET}/readcd \
 		${STAGEDIR}${PREFIX}/bin
-.if defined(WITH_RSCSI)
+.if ${PORT_OPTIONS:MRSCSI}
 	${INSTALL_PROGRAM} ${WRKSRC}/rscsi/OBJ/${CDRTLSTARGET}/rscsi \
 		${STAGEDIR}${PREFIX}/sbin
 .endif
@@ -190,7 +174,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/cdrecord/cdrecord.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/readcd/readcd.1 ${STAGEDIR}${PREFIX}/man/man1
-.if defined(WITH_RSCSI)
+.if ${PORT_OPTIONS:MRSCSI}
 	@${INSTALL_MAN} ${WRKSRC}/rscsi/rscsi.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
 	${INSTALL_MAN} ${WRKSRC}/scgcheck/scgcheck.1 \
@@ -209,7 +193,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsiconv/tables/${i} \
 		${STAGEDIR}${PREFIX}/lib/siconv
 .endfor
-.if defined(WITH_RSCSI)
+.if ${PORT_OPTIONS:MRSCSI}
 	${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl \
 		${STAGEDIR}${PREFIX}/etc/rscsi.sample
 .if !exists(${STAGEDIR}${PREFIX}/etc/rscsi)
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 0881d3ac0d6c..fbcecca208c3 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cdrtools-3.01a23.tar.bz2) = 92c5044d075739edbeaf7c63db2b0a4313b3d726a4b16d71410e6e062c3afc36
-SIZE (cdrtools-3.01a23.tar.bz2) = 2068254
+SHA256 (cdrtools-3.01a24.tar.bz2) = 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b
+SIZE (cdrtools-3.01a24.tar.bz2) = 2075400
diff --git a/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul b/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
index a5caa1855562..549d244d4e4d 100644
--- a/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
+++ b/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
@@ -17,8 +17,12 @@
 
 --- RULES/cc-gcc.rul.orig	Thu Jul  6 12:59:44 2006
 +++ RULES/cc-gcc.rul	Sat Jul 22 03:55:52 2006
-@@ -22,8 +22,9 @@
- ###########################################################################
+@@ -24,11 +24,12 @@
+ GCC_OPT=
+ GCC_OPT32=	-m32
+ GCC_OPT64=	-m64
+-GCC_OPTXX=	$(GCC_OPT$(C_ARCH:gcc%=%))
++GCC_OPTXX=
  
  CPPFLAGS=	-DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX) $(OSINCDIRS:%=-I%) $(OSDEFS) $(OSDEFSX)
 -CFLAGS=		$(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
@@ -28,21 +32,21 @@
 +C++FLAGS=	$(C++OPTS) $(C++WARNOPTS) $(CXXFLAGS) $(G++OPTOPT) $(C++OPTX)
  
  CPPOPTS=	-I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%)
- COPTS=
-@@ -31,12 +32,10 @@
+ COPTS=		$(GCC_OPTXX)
+@@ -36,12 +37,10 @@
  CWOPTS=		-Wall -Wtraditional
  CWOPTS=		-Wall -Wno-unknown-pragmas \
  		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
 -COPTOPT=	-O
  COPTDYN=	-fpic
  COPTGPROF=	-pg
- C++OPTS=
+ C++OPTS=	$(GCC_OPTXX)
  C++WOPTS=	$(CWOPTS)
 -C++OPTOPT=	$(COPTOPT)
  C++OPTDYN=	-fpic
  C++OPTGPROF=	-pg
  
-@@ -56,28 +55,18 @@
+@@ -61,28 +60,18 @@
  
  FLOAT_OPTIONS=	
  
@@ -59,12 +63,12 @@
 -CC=		$(CC_COM_DEF)
 -CCC=		$(CC++_COM_DEF)
 -
--CCCC=		@echo "	==> COMPILING \"$@\""; $(CC_COM)
--CC++ =		@echo "	==> COMPILING \"$@\""; $(CC++_COM)
--LDCC=		@echo "	==> LINKING \"$@\""; $(CC_COM)
--LDCC++ =	@echo "	==> LINKING \"$@\""; $(CC++_COM)
--DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; $(CC_COM)
--DYNLDC++ =	@echo "	==> LINKING dynamic library \"$@\""; $(CC++_COM)
+-CCCC=		@echo "	==> COMPILING \"$@\""; $(CC_COM) $(GCC_OPTXX)
+-CC++ =		@echo "	==> COMPILING \"$@\""; $(CC++_COM) $(GCC_OPTXX)
+-LDCC=		@echo "	==> LINKING \"$@\""; $(CC_COM) $(GCC_OPTXX)
+-LDCC++ =	@echo "	==> LINKING \"$@\""; $(CC++_COM) $(GCC_OPTXX)
+-DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; $(CC_COM) $(GCC_OPTXX)
+-DYNLDC++ =	@echo "	==> LINKING dynamic library \"$@\""; $(CC++_COM) $(GCC_OPTXX)
 +CC_COM=		$(CC)
 +CC++_COM=	$(CXX)
 +
@@ -76,9 +80,9 @@
 +DYNLDC++ =	$(CC++_COM)
  
  RMDEP=		:
--MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) -M
+-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC_COM) $(GCC_OPTXX) -M
 +MKDEP=		$(CC_COM) -M
  MKDEP_OUT=
--MKC++DEP=	@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) -M
+-MKC++DEP=	@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CC++_COM) $(GCC_OPTXX) -M
 +MKC++DEP=	$(CC++_COM) -M
  MKC++DEP_OUT=