- Add LICENSE_FILE

- Switch to options helpers
- Pet portlint
- Regenerate patches with `make makepatch`

5 files changed, 18 insertions, 14 deletions

diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 375a94dbf955..9844f480f5ae 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -12,9 +12,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DVD burning software
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+
 # On some systems, among them one 900044 i386, the do-build-invoked
 # "make" will just do nothing for reasons not yet found, as of
 # dvd+rw-tools 7.1. It is supposed to call
@@ -40,7 +42,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/dvd+rw-tools/files/patch-Makefile.m4 b/sysutils/dvd+rw-tools/files/patch-Makefile.m4
index a1ab7cf53702..214585f74cfd 100644
--- a/sysutils/dvd+rw-tools/files/patch-Makefile.m4
+++ b/sysutils/dvd+rw-tools/files/patch-Makefile.m4
@@ -1,6 +1,6 @@
---- Makefile.m4.orig	2013-01-15 00:37:00.032987000 +0100
-+++ Makefile.m4	2013-01-15 00:44:01.343576000 +0100
-@@ -13,6 +13,7 @@
+--- Makefile.m4.orig	2008-03-02 17:17:09 UTC
++++ Makefile.m4
+@@ -13,6 +13,7 @@ ifelse(substr(OS,0,7),[CYGWIN_],[define(
  ifelse(substr(OS,0,7),[MINGW32],[define([OS],[MINGW32])])
  ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
  ifelse(OS,OpenBSD,[define([OS],[BSD])])
diff --git a/sysutils/dvd+rw-tools/files/patch-growisofs.c b/sysutils/dvd+rw-tools/files/patch-growisofs.c
index d4a91a124411..3bef30a1741e 100644
--- a/sysutils/dvd+rw-tools/files/patch-growisofs.c
+++ b/sysutils/dvd+rw-tools/files/patch-growisofs.c
@@ -1,5 +1,5 @@
---- growisofs.c.orig	2008-03-04 10:15:03.000000000 +0100
-+++ growisofs.c	2013-01-15 00:53:04.894335000 +0100
+--- growisofs.c.orig	2008-03-04 09:15:03 UTC
++++ growisofs.c
 @@ -409,7 +409,7 @@
  #  define _GNU_SOURCE
  # endif
@@ -9,7 +9,7 @@
  # define off64_t	off_t
  # if !defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) || \
                __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__<1050
-@@ -995,7 +995,7 @@
+@@ -995,7 +995,7 @@ char *setup_fds (char *device)
      goto open_rw;
  }
  
@@ -18,7 +18,7 @@
  
  #include <sys/cdio.h>
  #include <camlib.h>
-@@ -2940,7 +2940,9 @@
+@@ -2940,7 +2940,9 @@ int main (int argc, char *argv[])
  # ifdef __FreeBSD__
  	syscall(SYS_mlockall,3);
  # else
diff --git a/sysutils/dvd+rw-tools/files/patch-mp.h b/sysutils/dvd+rw-tools/files/patch-mp.h
index 58aa5de6372a..4e7df82b1060 100644
--- a/sysutils/dvd+rw-tools/files/patch-mp.h
+++ b/sysutils/dvd+rw-tools/files/patch-mp.h
@@ -1,6 +1,6 @@
---- mp.h.orig	2008-02-24 18:56:07.000000000 +0100
-+++ mp.h	2013-01-15 00:54:45.484476000 +0100
-@@ -46,7 +46,9 @@
+--- mp.h.orig	2008-02-24 17:56:07 UTC
++++ mp.h
+@@ -46,7 +46,9 @@ static void *__thread_create(int (*func)
  
      if (pthread_attr_init(&attr)==0 &&
  	pthread_attr_setstacksize(&attr,stack_sz)==0 &&
diff --git a/sysutils/dvd+rw-tools/files/patch-transport.hxx b/sysutils/dvd+rw-tools/files/patch-transport.hxx
index 5975b71a6201..ae581cc309dc 100644
--- a/sysutils/dvd+rw-tools/files/patch-transport.hxx
+++ b/sysutils/dvd+rw-tools/files/patch-transport.hxx
@@ -1,6 +1,6 @@
---- transport.hxx.orig	2013-01-15 00:38:53.673146000 +0100
-+++ transport.hxx	2013-01-15 00:39:31.283199000 +0100
-@@ -483,7 +483,7 @@
+--- transport.hxx.orig	2008-03-01 10:34:43 UTC
++++ transport.hxx
+@@ -483,7 +483,7 @@ public:
      {	return 1;   }
  };