Attachment 140202 Details for Bug 186715 – dvdisaster.diff

[patch] dvdisaster.diff

dvdisaster.diff (text/plain; charset=US-ASCII), 8.15 KB, created by Horia Racoviceanu on 2014-02-23 20:47:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2014-02-23 20:47:22 UTC

Size: 8.15 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 345257)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	dvdisaster
> PORTVERSION=	0.72.5
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> MASTER_SITES=	http://dvdisaster.net/downloads/
> 
>@@ -17,7 +18,8 @@
> 
> USES=		gmake pkgconfig
> USE_BZIP2=	yes
>-USE_GNOME=	gtk20
>+USE_GNOME=	gtk20 cairo
>+GNU_CONFIGURE=	yes
> CONFIGURE_LOG=	configure.log
> CONFIGURE_ARGS=	--prefix=${PREFIX} \
> 		--docsubdir="/" \
>@@ -24,7 +26,6 @@
> 		--png-includes=${LOCALBASE}/include \
> 		--png-libraries=${LOCALBASE}/lib \
> 		--phpmountdir=${LOCALBASE}/www/${PORTNAME} \
>-		--mandir=${PREFIX}/man \
> 		--localedir=${PREFIX}/share/locale \
> 		--buildroot=${STAGEDIR}
> MAKE_JOBS_UNSAFE=	yes
>@@ -32,33 +33,69 @@
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS NLS
>+OPTIONS_GROUP=	DEBUG
>+OPTIONS_GROUP_DEBUG=	EFENCE MEMDEBUG
> OPTIONS_SUB=	yes
> 
>+EFENCE_DESC=	Electric Fence malloc() debugger
>+MEMDEBUG_DESC=	Enable memory debugging
>+
> DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
>-DOCS_CONFIGURE_OFF=	--docdir=${WRKSRC}
> 
>+MEMDEBUG_CONFIGURE_ON=	-with-memdebug=yes
>+
>+EFENCE_LIB_DEPENDS=	libefence.so.0:${PORTSDIR}/devel/ElectricFence
>+EFENCE_CONFIGURE_ON=	-with-efence=yes
>+
> NLS_USES=	gettext
>+NLS_CONFIGURE_OFF=	-with-nls=no
> 
>+.include <bsd.port.pre.mk>
>+
> post-patch:
> 	${REINPLACE_CMD} -e '/REQUIRE_GCC/d' \
>-		${WRKSRC}/configure ${WRKSRC}/tools/configure
>-	${REINPLACE_CMD} -e 's|$$(CFG_GTK2_CFLAGS)|$$(CFG_GTK2_CFLAGS) -w|' \
>-		${WRKSRC}/GNUmakefile.template
>+			${WRKSRC}/configure ${WRKSRC}/tools/configure
>+	${REINPLACE_CMD} -e '/dvdisaster uninstaller/,+12 d' \
>+			${WRKSRC}/GNUmakefile.template
> 	${REINPLACE_CMD} -e 's|(ctx)|(*ctx)|' \
>-		${WRKSRC}/md5.c
>+			${WRKSRC}/md5.c
>+	${REINPLACE_CMD} -e 's|stdout, msg|stdout, "msg\\n"|' \
>+			${WRKSRC}/tools/memory.c
> 
>+.if ! ${PORT_OPTIONS:MDOCS}
>+	${REINPLACE_CMD} -e 's|THESE_ARE_THE_DEVEL_SOURCES;|GNUmakefile;|; \
>+		/install -d $$(BUILDROOT)$$(DOCSUBDIR)/,+18 d' \
>+			${WRKSRC}/GNUmakefile.template
>+.elif ${OSVERSION} > 1000000 && ${ARCH} == i386
>+	${REINPLACE_CMD} -e 's|THESE_ARE_THE_DEVEL_SOURCES;|GNUmakefile;|; \
>+		/install -m 644 README.MODIFYING/{N;p;s/.*/	install -m 644 TODO $$(BUILDROOT)$$(DOCSUBDIR)/;}; \
>+		/install -m 644 TODO $$(BUILDROOT)$$(DOCSUBDIR)/,+13 d' \
>+			${WRKSRC}/GNUmakefile.template
>+.endif
>+
>+.if ! ${PORT_OPTIONS:MNLS}
>+	${REINPLACE_CMD} -e 's|DOC_LOCALES = cs de en ru|DOC_LOCALES = en|; \
>+		s|install -m 644 CREDITS\*|install -m 644 CREDITS\.en|' \
>+			${WRKSRC}/GNUmakefile.template
>+.endif
>+
> do-configure:
> 	@(cd ${CONFIGURE_WRKSRC} && \
>-		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
>-	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
>-	    INSTALL="${INSTALL} -c ${_BINOWNGRP}" \
>-	    INSTALL_DATA="${INSTALL_DATA}" \
>-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
>-	    ${CONFIGURE_ENV} bash configure ${CONFIGURE_ARGS}; then \
>-		 ${ECHO_CMD} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
>-		 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
>-		 ${FALSE}; \
>-		fi)
>+	if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
>+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
>+		INSTALL="${INSTALL} -c ${_BINOWNGRP}" \
>+		INSTALL_DATA="${INSTALL_DATA}" \
>+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>+		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
>+	${CONFIGURE_ENV} bash configure ${CONFIGURE_ARGS}; then \
>+		${ECHO_CMD} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
>+		(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
>+		${FALSE}; \
>+	fi)
> 
>-.include <bsd.port.mk>
>+post-install:
>+.if ! ${PORT_OPTIONS:MEFENCE} || ! ${PORT_OPTIONS:MMEMDEBUG}
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: files/patch-GNUmakefile.template
>===================================================================
>--- files/patch-GNUmakefile.template	(revision 345257)
>+++ files/patch-GNUmakefile.template	(working copy)
>@@ -1,35 +0,0 @@
>---- ./GNUmakefile.template.orig	2013-11-25 05:07:19.000000000 +0000
>-+++ ./GNUmakefile.template	2013-11-25 05:08:26.000000000 +0000
>-@@ -356,19 +356,19 @@
>- 	    install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
>- 	  done \
>- 	fi
>--	@echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>--	@echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>--	@echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>--	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>--	@echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>--	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>--	@for i in $(PO_LOCALES); do \
>--	  echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
>--	done
>--	@for i in $(MAN_LOCALES); do \
>--	  echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
>--	done
>--	@echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>-+#	@for i in $(PO_LOCALES); do \
>-+#	  echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
>-+#	done
>-+#	@for i in $(MAN_LOCALES); do \
>-+#	  echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
>-+#	done
>-+#	@echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
>- 	
>- uninstall:
>- 	@echo "Uninstalling package..."
>Index: files/patch-tools__memory.c
>===================================================================
>--- files/patch-tools__memory.c	(revision 345257)
>+++ files/patch-tools__memory.c	(working copy)
>@@ -1,11 +0,0 @@
>---- ./tools/memory.c.orig	2012-03-26 14:46:05.000000000 +0200
>-+++ ./tools/memory.c	2014-01-08 14:13:28.000000000 +0100
>-@@ -165,7 +165,7 @@
>- static void print_ptrs(char *msg)
>- {  int bucket,i,n=0;
>- 
>--   fprintf(stdout, msg);
>-+   fprintf(stdout, "msg\n");
>- 
>-    for(bucket=0; bucket<64; bucket++)
>-       for(i=0; i<phCnt[bucket]; i++)
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 345257)
>+++ pkg-message	(working copy)
>@@ -6,4 +6,38 @@
> so the program will not detect any available drives if the user running
> dvdisaster does not have permissions to read /dev/pass*
> 
>+FreeBSD 9.x does not pre-install an uniform CD-ROM driver for SCSI and ATAPI
>+drives. Therefore dvdisaster can not use any ATAPI drives in an out-of-the-box
>+FreeBSD 9.x installation.
>+
>+* Loading the atapicam kernel module by hand
>+
>+To manually load the required kernel module, do:
>+
>+root@freebsd# kldload atapicam
>+
>+Use the follwing command to see if any CD/DVD/BD drives became available:
>+
>+root@freebsd# camcontrol devlist
>+<NAME OF YOUR DRIVE>                at scbus1 target 0 lun 0 (pass0,cd0)
>+
>+* (Optionally) loading the atapicam kernel module permanently
>+
>+If the above step works you can load the kernel module at boot time by adding
>+
>+atapicam_load="YES"
>+
>+at the end of /boot/loader.conf      
>+
>+* (Optionally) recompiling the kernel
>+
>+If the atapicam kernel module is not available (check the contents
>+of /boot/kernel) you will need to recompile the kernel with the following
>+additional device line in the kernel configuration:
>+
>+device atapicam
>+
>+The devices ata, scbus, cd, and pass are also required, but are included by
>+default in FreeBSD 6.0 and later.
>+
> ===============================================================================

Actions: View | Diff

Attachments on bug 186715: 140201 | 140202