- Update to 3.02a04

- Fix build when `uname -m` != `uname -p`

4 files changed, 10 insertions, 11 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 72d442e17116..b5a128eedd23 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -18,7 +18,7 @@
 ###########################################################################
 
 PORTNAME=	cdrtools
-PORTVERSION=	3.01a24
+PORTVERSION=	3.02a04
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	SF/${PORTNAME}/alpha
@@ -86,7 +86,8 @@ PKGNAMESUFFIX?=	-devel
 
 MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
 		INS_RBASE=${LOCALBASE}
-CDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
+CDRTLSTARGET=	${ARCH}-${OPSYS:tl}-cc
+CDRTLSXARCH!=	${UNAME} -m
 
 .if exists(/usr/include/iconv.h) || exists(${LOCALBASE}/lib/libiconv.a) || \
 	exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS}
@@ -100,9 +101,9 @@ post-extract:
 	@${CP} -fp ${PORTSDIR}/Templates/${i} ${WRKSRC}/${j}
 .endfor
 .endfor
-.if ${CDRTLSTARGET} != "i386-freebsd-cc"
+.if ${CDRTLSXARCH} != "i386"
 	@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
-		${WRKSRC}/RULES/${CDRTLSTARGET}.rul
+		${WRKSRC}/RULES/${CDRTLSXARCH}-${OPSYS:tl}-cc.rul
 .endif
 
 post-patch:
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index fbcecca208c3..d74be170945a 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cdrtools-3.01a24.tar.bz2) = 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b
-SIZE (cdrtools-3.01a24.tar.bz2) = 2075400
+SHA256 (cdrtools-3.02a04.tar.bz2) = a450034d583b7f070be8b6327e69e90508d8022d0234c907c5e23e35c1ab8ba1
+SIZE (cdrtools-3.02a04.tar.bz2) = 2112841
diff --git a/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 b/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
index ebd5ae8842c3..f643d7dacbc4 100644
--- a/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
+++ b/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
@@ -17,14 +17,12 @@
 
 --- readcd/readcd.1.orig	Mon Sep 29 14:53:05 2003
 +++ readcd/readcd.1	Mon Sep 29 15:10:06 2003
-@@ -432,9 +432,7 @@
- .SH FILES
+@@ -604,8 +604,6 @@
  .SH SEE ALSO
  .BR cdrecord (1),
--.BR mkisofs (1),
+ .BR mkisofs (8),
 -.BR scg (7),
 -.BR fbk (7),
-+.BR mkisofs (8),
  .BR rcmd (3),
  .BR ssh (1).
  
diff --git a/sysutils/cdrtools-devel/pkg-descr b/sysutils/cdrtools-devel/pkg-descr
index 9cdfa04e80aa..5d82f883df49 100644
--- a/sysutils/cdrtools-devel/pkg-descr
+++ b/sysutils/cdrtools-devel/pkg-descr
@@ -19,4 +19,4 @@ This package contains the following programs:
 - scgcheck (checks and validates the ABI of libscg)
 - rscsi (daemon providing access to local SCSI-devices over the network)
 
-WWW: http://cdrecord.berlios.de/old/private/cdrecord.html
+WWW: http://cdrecord.org/