Index: head/sysutils/dvd+rw-tools/Makefile =================================================================== --- head/sysutils/dvd+rw-tools/Makefile (revision 409325) +++ head/sysutils/dvd+rw-tools/Makefile (revision 409326) @@ -1,46 +1,50 @@ # Created by: Charles Swiger # $FreeBSD$ PORTNAME= dvd+rw-tools PORTVERSION= 7.1 PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.pkix.net/mirror/fy.chalmers.se/ \ http://fy.chalmers.se/~appro/linux/DVD+RW/tools/ 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 # (m4 -DOS=`uname -s` Makefile.m4 | make -f - dvd+rw-tools) # but returns success right away. # Using gmake bypasses this problem for unknown reasons. Please leave it in, # until the problem is analyzed and fixed - and please comment the fix here. USES= gmake BIN_FILES= dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo \ dvd-ram-control growisofs PLIST_FILES= ${BIN_FILES:S|^|bin/|} \ man/man1/growisofs.1.gz PORTDOCS= index.html OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's/-O2//' ${WRKSRC}/Makefile.m4 do-install: .for i in ${BIN_FILES} ${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 Index: head/sysutils/dvd+rw-tools/files/patch-Makefile.m4 =================================================================== --- head/sysutils/dvd+rw-tools/files/patch-Makefile.m4 (revision 409325) +++ head/sysutils/dvd+rw-tools/files/patch-Makefile.m4 (revision 409326) @@ -1,10 +1,10 @@ ---- 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])]) +ifelse(OS,DragonFly,[define([OS],[BSD])LDLIBS=-lcam]) ifelse(OS,FreeBSD,[define([OS],[BSD])LDLIBS=-lcam]) ifelse(OS,IRIX64,[define([OS],[IRIX])]) Index: head/sysutils/dvd+rw-tools/files/patch-growisofs.c =================================================================== --- head/sysutils/dvd+rw-tools/files/patch-growisofs.c (revision 409325) +++ head/sysutils/dvd+rw-tools/files/patch-growisofs.c (revision 409326) @@ -1,30 +1,30 @@ ---- 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 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || \ - (defined(__APPLE__) && defined(__MACH__)) + (defined(__APPLE__) && defined(__MACH__)) || defined(__DragonFly__) # 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; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #include -@@ -2940,7 +2940,9 @@ +@@ -2940,7 +2940,9 @@ int main (int argc, char *argv[]) # ifdef __FreeBSD__ syscall(SYS_mlockall,3); # else +# if !defined(__DragonFly__) mlockall(MCL_CURRENT|MCL_FUTURE); +# endif # endif } while (0); Index: head/sysutils/dvd+rw-tools/files/patch-mp.h =================================================================== --- head/sysutils/dvd+rw-tools/files/patch-mp.h (revision 409325) +++ head/sysutils/dvd+rw-tools/files/patch-mp.h (revision 409326) @@ -1,12 +1,12 @@ ---- 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 && +#if !defined(__DragonFly__) pthread_attr_setscope(&attr,PTHREAD_SCOPE_SYSTEM)==0 && +#endif pthread_create(&h,&attr,(void *(*)(void *))func,arg)==0 ) return (void *)h; Index: head/sysutils/dvd+rw-tools/files/patch-transport.hxx =================================================================== --- head/sysutils/dvd+rw-tools/files/patch-transport.hxx (revision 409325) +++ head/sysutils/dvd+rw-tools/files/patch-transport.hxx (revision 409326) @@ -1,11 +1,11 @@ ---- 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; } }; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #include