Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Feb 2016 10:08:54 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409326 - in head/sysutils/dvd+rw-tools: . files
Message-ID:  <201602221008.u1MA8s4x006813@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Feb 22 10:08:54 2016
New Revision: 409326
URL: https://svnweb.freebsd.org/changeset/ports/409326

Log:
  - Add LICENSE_FILE
  - Switch to options helpers
  - Pet portlint
  - Regenerate patches with `make makepatch`

Modified:
  head/sysutils/dvd+rw-tools/Makefile
  head/sysutils/dvd+rw-tools/files/patch-Makefile.m4
  head/sysutils/dvd+rw-tools/files/patch-growisofs.c
  head/sysutils/dvd+rw-tools/files/patch-mp.h
  head/sysutils/dvd+rw-tools/files/patch-transport.hxx

Modified: head/sysutils/dvd+rw-tools/Makefile
==============================================================================
--- head/sysutils/dvd+rw-tools/Makefile	Mon Feb 22 10:02:45 2016	(r409325)
+++ head/sysutils/dvd+rw-tools/Makefile	Mon Feb 22 10:08:54 2016	(r409326)
@@ -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>

Modified: head/sysutils/dvd+rw-tools/files/patch-Makefile.m4
==============================================================================
--- head/sysutils/dvd+rw-tools/files/patch-Makefile.m4	Mon Feb 22 10:02:45 2016	(r409325)
+++ head/sysutils/dvd+rw-tools/files/patch-Makefile.m4	Mon Feb 22 10:08:54 2016	(r409326)
@@ -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])])

Modified: head/sysutils/dvd+rw-tools/files/patch-growisofs.c
==============================================================================
--- head/sysutils/dvd+rw-tools/files/patch-growisofs.c	Mon Feb 22 10:02:45 2016	(r409325)
+++ head/sysutils/dvd+rw-tools/files/patch-growisofs.c	Mon Feb 22 10:08:54 2016	(r409326)
@@ -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

Modified: head/sysutils/dvd+rw-tools/files/patch-mp.h
==============================================================================
--- head/sysutils/dvd+rw-tools/files/patch-mp.h	Mon Feb 22 10:02:45 2016	(r409325)
+++ head/sysutils/dvd+rw-tools/files/patch-mp.h	Mon Feb 22 10:08:54 2016	(r409326)
@@ -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 &&

Modified: head/sysutils/dvd+rw-tools/files/patch-transport.hxx
==============================================================================
--- head/sysutils/dvd+rw-tools/files/patch-transport.hxx	Mon Feb 22 10:02:45 2016	(r409325)
+++ head/sysutils/dvd+rw-tools/files/patch-transport.hxx	Mon Feb 22 10:08:54 2016	(r409326)
@@ -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;   }
  };
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602221008.u1MA8s4x006813>