- Update to 3.02a09

- Pet portlint

16 files changed, 84 insertions, 53 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index a18ba32e5aa5..c1c34429f4ca 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -18,7 +18,7 @@
 ###########################################################################
 
 PORTNAME=	cdrtools
-PORTVERSION=	3.02a07
+PORTVERSION=	3.02a09
 PORTEPOCH=	1
 CATEGORIES=	sysutils audio
 MASTER_SITES=	SF/${PORTNAME}/alpha
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 367ef34b7892..eab66b250425 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482864063
-SHA256 (cdrtools-3.02a07.tar.bz2) = 49c1a67fa7ad3d7c0b05d41d18cb6677b40d4811faba111f0c01145d3ef0491b
-SIZE (cdrtools-3.02a07.tar.bz2) = 2127058
+TIMESTAMP = 1526292215
+SHA256 (cdrtools-3.02a09.tar.bz2) = aa28438f458ef3f314b79f2029db27679dae1d5ffe1569b6de57742511915e81
+SIZE (cdrtools-3.02a09.tar.bz2) = 2156745
diff --git a/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd b/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd
index 5e08bb8ff554..116baad30d75 100644
--- a/sysutils/cdrtools-devel/files/patch-DEFAULTS__Defaults.freebsd
+++ b/sysutils/cdrtools-devel/files/patch-DEFAULTS_Defaults.freebsd
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- DEFAULTS/Defaults.freebsd.orig	2013-11-04 21:58:20.000000000 +0100
-+++ DEFAULTS/Defaults.freebsd	2014-02-03 01:16:19.000000000 +0100
-@@ -29,8 +29,8 @@
+--- DEFAULTS/Defaults.freebsd.orig	2013-11-04 20:58:20 UTC
++++ DEFAULTS/Defaults.freebsd
+@@ -29,8 +29,8 @@ DEFLINKMODE=	static
  CWARNOPTS=
  
  DEFINCDIRS=	$(SRCROOT)/include
diff --git a/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul b/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul
index 549d244d4e4d..6762c784a475 100644
--- a/sysutils/cdrtools-devel/files/patch-RULES__cc-gcc.rul
+++ b/sysutils/cdrtools-devel/files/patch-RULES_cc-gcc.rul
@@ -15,8 +15,8 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- RULES/cc-gcc.rul.orig	Thu Jul  6 12:59:44 2006
-+++ RULES/cc-gcc.rul	Sat Jul 22 03:55:52 2006
+--- RULES/cc-gcc.rul.orig	2017-05-28 21:47:50 UTC
++++ RULES/cc-gcc.rul
 @@ -24,11 +24,12 @@
  GCC_OPT=
  GCC_OPT32=	-m32
@@ -33,7 +33,7 @@
  
  CPPOPTS=	-I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%)
  COPTS=		$(GCC_OPTXX)
-@@ -36,12 +37,10 @@
+@@ -36,12 +37,10 @@ COPTS=		$(GCC_OPTXX)
  CWOPTS=		-Wall -Wtraditional
  CWOPTS=		-Wall -Wno-unknown-pragmas \
  		-Wshadow -Wmissing-prototypes -Wstrict-prototypes
@@ -46,7 +46,7 @@
  C++OPTDYN=	-fpic
  C++OPTGPROF=	-pg
  
-@@ -61,28 +60,18 @@
+@@ -63,28 +62,18 @@ LNDYNLIB=	@$(RM) $(RM_FORCE) $(PTARGET_B
  
  FLOAT_OPTIONS=	
  
@@ -62,16 +62,15 @@
 -CC++_COM_DEF=	g++
 -CC=		$(CC_COM_DEF)
 -CCC=		$(CC++_COM_DEF)
--
++CC_COM=		$(CC)
++CC++_COM=	$(CXX)
+ 
 -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)
-+
 +CCCC =		$(CC_COM)
 +CC++ =		$(CC++_COM)
 +LDCC=		$(CC_COM)
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1 b/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1
deleted file mode 100644
index c8b30d32f974..000000000000
--- a/sysutils/cdrtools-devel/files/patch-btcflash__btcflash.1
+++ /dev/null
@@ -1,10 +0,0 @@
---- btcflash/btcflash.1.orig	Wed Feb  8 23:13:24 2006
-+++ btcflash/btcflash.1	Thu Feb 16 14:54:32 2006
-@@ -293,7 +293,6 @@
- login shell.
- .SH "SEE ALSO"
- .BR cdrecord (1),
--.BR scg (7),
- .BR rcmd (3),
- .BR ssh (1).
- .SH NOTES
diff --git a/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1 b/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1
new file mode 100644
index 000000000000..3b94063221d0
--- /dev/null
+++ b/sysutils/cdrtools-devel/files/patch-btcflash_btcflash.1
@@ -0,0 +1,10 @@
+--- btcflash/btcflash.1.orig	2016-01-26 21:46:49 UTC
++++ btcflash/btcflash.1
+@@ -353,7 +353,6 @@ using an account that has been created w
+ login shell.
+ .SH "SEE ALSO"
+ .BR cdrecord (1),
+-.BR scg (7),
+ .BR rcmd (3),
+ .BR ssh (1).
+ .SH NOTES
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi b/sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
index 9398843e937a..03277e4e065f 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord__README.rscsi
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord_README.rscsi
@@ -1,17 +1,17 @@
---- cdrecord/README.rscsi.orig	Sun Aug 17 11:31:39 2003
-+++ cdrecord/README.rscsi	Sun Aug 17 14:38:57 2003
-@@ -18,24 +18,21 @@
+--- cdrecord/README.rscsi.orig	2004-05-19 14:12:05 UTC
++++ cdrecord/README.rscsi
+@@ -18,24 +18,21 @@ There are three possible ways to control
  		NOTE: In this case, rscsi must be installed suid root. 
  		**** This is the preferred method ****
  
 -To enable remote SCSI via the login shell method you should do the following:
 -
 -	-	Add an entry to /etc/passwd in the form:
+-
+-		rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
 +		The FreeBSD port automatically installs the rscsi binary suid
 +		root and creates the user "rscsi".
  
--		rscsi:x:1999:1000:Tape:/export/home/rscsi:/opt/schily/sbin/rscsi
--
 -		(modify this according to your OS). And don't forget to
 -		modify /etc/shadow the way it needs to be on your OS.
 +To enable remote SCSI via the login shell method you should do the following:
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1 b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
index 88dc6bf0398f..2ada85f584d1 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.1
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.1
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- cdrecord/cdrecord.1.orig	Mon Sep 29 14:48:48 2003
-+++ cdrecord/cdrecord.1	Mon Sep 29 14:49:23 2003
-@@ -1738,8 +1738,6 @@
+--- cdrecord/cdrecord.1.orig	2017-09-21 14:11:50 UTC
++++ cdrecord/cdrecord.1
+@@ -3169,8 +3169,6 @@ There must be at least one track per fil
  .SH SEE ALSO
  .BR cdda2wav (1),
  .BR readcd (1),
diff --git a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl
index 859f92768c34..85aceeb63486 100644
--- a/sysutils/cdrtools-devel/files/patch-cdrecord__cdrecord.dfl
+++ b/sysutils/cdrtools-devel/files/patch-cdrecord_cdrecord.dfl
@@ -1,5 +1,5 @@
---- cdrecord/cdrecord.dfl.orig	Mon Aug 18 19:45:45 2003
-+++ cdrecord/cdrecord.dfl	Mon Aug 18 19:46:32 2003
+--- cdrecord/cdrecord.dfl.orig	2014-01-03 21:59:27 UTC
++++ cdrecord/cdrecord.dfl
 @@ -3,7 +3,7 @@
  # This file is /etc/default/cdrecord
  # It contains defaults that are used if no command line option
diff --git a/sysutils/cdrtools-devel/files/patch-inc_avoffset.c b/sysutils/cdrtools-devel/files/patch-inc_avoffset.c
index ab1af624da6d..a2c0807ebfd0 100644
--- a/sysutils/cdrtools-devel/files/patch-inc_avoffset.c
+++ b/sysutils/cdrtools-devel/files/patch-inc_avoffset.c
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- inc/avoffset.c.orig	2011-11-28 19:28:41 UTC
+--- inc/avoffset.c.orig	2017-08-01 18:10:02 UTC
 +++ inc/avoffset.c
-@@ -60,7 +60,7 @@ main(ac, av)
+@@ -50,7 +50,7 @@ main(ac, av)
  {
  	int		stdir;
  #ifdef	HAVE_SCANSTACK
@@ -26,3 +26,19 @@
  	register int	i = 0;
  	register int	o = 0;
  
+@@ -105,6 +105,7 @@ main(ac, av)
+ 	 * does not affect the new code extended as well.
+ 	 */
+ 	while (i <= 1000 && fp->fr_savfp) {
++#if 0
+ 		/*
+ 		 * Workaround for the still buggy clang...
+ 		 * clang version 4.0.0 on ARM64 FreeBSD has become worse.
+@@ -113,6 +114,7 @@ main(ac, av)
+ 		 * is never touched.
+ 		 */
+ 		write(-1, "", 0);
++#endif
+ 		if (fp->fr_savpc == 0)
+ 			break;
+ 
diff --git a/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h b/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h
index e93f886de086..837c22b2b361 100644
--- a/sysutils/cdrtools-devel/files/patch-include__schily__sha2.h
+++ b/sysutils/cdrtools-devel/files/patch-include_schily_sha2.h
@@ -1,6 +1,6 @@
---- include/schily/sha2.h.orig	2010-08-27 12:41:30.000000000 +0200
-+++ include/schily/sha2.h	2012-10-20 14:39:42.000000000 +0200
-@@ -104,10 +104,12 @@
+--- include/schily/sha2.h.orig	2010-08-27 10:41:30 UTC
++++ include/schily/sha2.h
+@@ -104,10 +104,12 @@ extern char *SHA256Data		__PR((const UIn
  
  #ifdef	HAVE_LONGLONG
  extern void SHA384Init		__PR((SHA2_CTX *));
diff --git a/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c b/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c
new file mode 100644
index 000000000000..e016ebf1921b
--- /dev/null
+++ b/sysutils/cdrtools-devel/files/patch-libschily_fnmatch.c
@@ -0,0 +1,16 @@
+--- libschily/fnmatch.c.orig	2017-08-29 23:04:40 UTC
++++ libschily/fnmatch.c
+@@ -369,11 +369,11 @@ rangematch(pattern, test, flags, newp, p
+ 					/*
+ 					 * Convert to the other case
+ 					 */
+-					if (strcmp(class, "upper") == 0)
++					if (strcmp(class, "upper") == 0) {
+ 						if (iswctype(otest,
+ 						    wctype("lower")))
+ 							ok = 1;
+-					else if (strcmp(class, "lower") == 0)
++					} else if (strcmp(class, "lower") == 0)
+ 						if (iswctype(otest,
+ 						    wctype("upper")))
+ 							ok = 1;
diff --git a/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8 b/sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8
index 26ae04ad8e71..3d2a81ccfdf2 100644
--- a/sysutils/cdrtools-devel/files/patch-mkisofs__mkisofs.8
+++ b/sysutils/cdrtools-devel/files/patch-mkisofs_mkisofs.8
@@ -1,6 +1,6 @@
---- mkisofs/mkisofs.8.orig	Mon Sep 29 15:11:48 2003
-+++ mkisofs/mkisofs.8	Mon Sep 29 15:19:01 2003
-@@ -1668,7 +1668,7 @@
+--- mkisofs/mkisofs.8.orig	2017-12-10 18:47:50 UTC
++++ mkisofs/mkisofs.8
+@@ -2739,7 +2739,7 @@ but is kept to be compatible with 
  The format of the
  .I magic
  file is almost identical to the
@@ -9,7 +9,7 @@
  file used by the Linux
  .BR file (1)
  command - the routines for reading and decoding the
-@@ -1707,7 +1707,7 @@
+@@ -2778,7 +2778,7 @@ l l l l .
  .TE
  .PP
  The format of the file is described in the
diff --git a/sysutils/cdrtools-devel/files/patch-readcd__readcd.1 b/sysutils/cdrtools-devel/files/patch-readcd_readcd.1
index f643d7dacbc4..27693336b41c 100644
--- a/sysutils/cdrtools-devel/files/patch-readcd__readcd.1
+++ b/sysutils/cdrtools-devel/files/patch-readcd_readcd.1
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- readcd/readcd.1.orig	Mon Sep 29 14:53:05 2003
-+++ readcd/readcd.1	Mon Sep 29 15:10:06 2003
-@@ -604,8 +604,6 @@
+--- readcd/readcd.1.orig	2017-06-06 18:15:16 UTC
++++ readcd/readcd.1
+@@ -641,8 +641,6 @@ is mapped to
  .SH SEE ALSO
  .BR cdrecord (1),
  .BR mkisofs (8),
diff --git a/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl b/sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl
index edbd1340c469..133c60e01a50 100644
--- a/sysutils/cdrtools-devel/files/patch-rscsi__rscsi.dfl
+++ b/sysutils/cdrtools-devel/files/patch-rscsi_rscsi.dfl
@@ -1,6 +1,6 @@
---- rscsi/rscsi.dfl.orig	Sun Aug 17 11:50:57 2003
-+++ rscsi/rscsi.dfl	Sun Aug 17 12:28:46 2003
-@@ -18,14 +18,13 @@
+--- rscsi/rscsi.dfl.orig	2005-08-09 13:19:20 UTC
++++ rscsi/rscsi.dfl
+@@ -25,14 +25,13 @@
  # Each USER= entry adds the listed user to the users who may run rscsi
  #
  # A typical passwd entry looks like this:
diff --git a/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1 b/sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1
index d42f4c8c1c98..ed501f6d29ec 100644
--- a/sysutils/cdrtools-devel/files/patch-scgcheck__scgcheck.1
+++ b/sysutils/cdrtools-devel/files/patch-scgcheck_scgcheck.1
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- scgcheck/scgcheck.1.orig	Mon Sep 29 14:56:16 2003
-+++ scgcheck/scgcheck.1	Mon Sep 29 14:56:44 2003
-@@ -234,8 +234,7 @@
+--- scgcheck/scgcheck.1.orig	2016-01-26 21:48:54 UTC
++++ scgcheck/scgcheck.1
+@@ -276,8 +276,7 @@ Specify the log file to be used instead 
  .SH SEE ALSO
  .BR cdrecord (1),
  .BR readcd (1),