Attachment 138018 Details for Bug 183838 – dvdisaster.diff

[patch] dvdisaster.diff

dvdisaster.diff (text/plain; charset=US-ASCII), 6.72 KB, created by Horia Racoviceanu on 2013-11-30 00:30:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2013-11-30 00:30:44 UTC

Size: 6.72 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 335101)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dvdisaster
>-PORTVERSION=	0.72.4
>-PORTREVISION=	1
>+PORTVERSION=	0.72.5
> CATEGORIES=	sysutils
> MASTER_SITES=	http://dvdisaster.net/downloads/
> 
>@@ -11,36 +10,38 @@
> COMMENT=	CD/DVD error recovery tool
> 
> LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
> 
> MAKEFILE=	GNUmakefile
> 
>+USES=		gmake pkgconfig
> USE_BZIP2=	yes
>-USES=		gettext pkgconfig
> USE_GNOME=	gtk20
>+CONFIGURE_LOG=	configure.log
> CONFIGURE_ARGS=	--prefix=${PREFIX} \
> 		--docsubdir="/" \
> 		--png-includes=${LOCALBASE}/include \
>-		--png-libraries=${LOCALBASE}/lib
>-USE_GMAKE=	yes
>-MAKE_JOBS_UNSAFE=yes
>+		--png-libraries=${LOCALBASE}/lib \
>+		--phpmountdir=${LOCALBASE}/www/${PORTNAME} \
>+		--mandir=${PREFIX}/man \
>+		--localedir=${PREFIX}/share/locale \
>+		--buildroot=${STAGEDIR}
>+MAKE_JOBS_UNSAFE=	yes
> 
>-.if defined(NOPORTDOCS)
>-CONFIGURE_ARGS+=	--docdir=${WRKSRC}
>-.else
>-CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
>-.endif
>-
> PORTDOCS=	*
> 
>-PORTSCOUT=	limitw:1,even
>+OPTIONS_DEFINE=	DOCS NLS
>+OPTIONS_SUB=	yes
> 
>-MAN1=		dvdisaster.1
>-MANLANG=	"" cs de it
>+DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
>+DOCS_CONFIGURE_OFF=	--docdir=${WRKSRC}
> 
>-NO_STAGE=	yes
>+NLS_USES=	gettext
>+
>+post-patch:
>+	${REINPLACE_CMD} -e '/REQUIRE_GCC/d' ${WRKSRC}/configure ${WRKSRC}/tools/configure
>+
> do-configure:
> 	@(cd ${CONFIGURE_WRKSRC} && \
> 		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
>@@ -55,7 +56,4 @@
> 			 ${FALSE}; \
> 		fi)
> 
>-post-install:
>-	@${CAT} ${PKGMESSAGE}
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 335101)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (dvdisaster-0.72.4.tar.bz2) = 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e
>-SIZE (dvdisaster-0.72.4.tar.bz2) = 5097738
>+SHA256 (dvdisaster-0.72.5.tar.bz2) = dd19e69d2ad361458cb5250d63ae6a483914f7fddeaa3593030e60ea65c4cfe0
>+SIZE (dvdisaster-0.72.5.tar.bz2) = 5065440
>Index: files/patch-GNUmakefile.template
>===================================================================
>--- files/patch-GNUmakefile.template	(revision 0)
>+++ files/patch-GNUmakefile.template	(working copy)
>@@ -0,0 +1,35 @@
>+--- ./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..."
>
>Property changes on: files/patch-GNUmakefile.template
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 335101)
>+++ pkg-message	(working copy)
>@@ -1,3 +1,9 @@
>+===============================================================================
>+
>+dvdisaster has been installed.
>+
> Note that dvdisaster tries to read /dev/pass* to list available CD/DVD drives,
> so the program will not detect any available drives if the user running
> dvdisaster does not have permissions to read /dev/pass*
>+
>+===============================================================================
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 335101)
>+++ pkg-plist	(working copy)
>@@ -1,27 +1,11 @@
> bin/dvdisaster
>-bin/dvdisaster-uninstall.sh
>-locale/cs/LC_MESSAGES/dvdisaster.mo
>-locale/de/LC_MESSAGES/dvdisaster.mo
>-locale/it/LC_MESSAGES/dvdisaster.mo
>-locale/ru/LC_MESSAGES/dvdisaster.mo
>-locale/sv/LC_MESSAGES/dvdisaster.mo
>-locale/pt_BR/LC_MESSAGES/dvdisaster.mo
>-@dirrm locale/pt_BR/LC_MESSAGES
>-@dirrm locale/pt_BR
>-@dirrm locale/sv/LC_MESSAGES
>-@dirrm locale/sv
>-@dirrm locale/ru/LC_MESSAGES
>-@dirrm locale/ru
>-@dirrm locale/it/LC_MESSAGES
>-@dirrm locale/it
>-@dirrm locale/de/LC_MESSAGES
>-@dirrm locale/de
>-@dirrm locale/cs/LC_MESSAGES
>-@dirrm locale/cs
>-@dirrmtry locale
>-@dirrmtry man/it/man1
>-@dirrmtry man/it
>-@dirrmtry man/de/man1
>-@dirrmtry man/de
>-@dirrmtry man/cs/man1
>-@dirrmtry man/cs
>+man/cs/man1/dvdisaster.1.gz
>+man/de/man1/dvdisaster.1.gz
>+man/it/man1/dvdisaster.1.gz
>+man/man1/dvdisaster.1.gz
>+%%NLS%%share/locale/cs/LC_MESSAGES/dvdisaster.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/dvdisaster.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/dvdisaster.mo
>+%%NLS%%share/locale/ru/LC_MESSAGES/dvdisaster.mo
>+%%NLS%%share/locale/sv/LC_MESSAGES/dvdisaster.mo
>+%%NLS%%share/locale/pt_BR/LC_MESSAGES/dvdisaster.mo

Actions: View | Diff

Attachments on bug 183838: 138017 | 138018