Attachment #138018 for bug #183838




# $FreeBSD$

PORTNAME=	dvdisaster
PORTVERSION=	0.72.5
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	http://dvdisaster.net/downloads/


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 \
		--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=	*

OPTIONS_DEFINE=	DOCS NLS
OPTIONS_SUB=	yes

DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
DOCS_CONFIGURE_OFF=	--docdir=${WRKSRC}

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}" \

			 ${FALSE}; \
		fi)

post-install:
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (dvdisaster-0.72.4.tar.bz2) = 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e	1	SHA256 (dvdisaster-0.72.5.tar.bz2) = dd19e69d2ad361458cb5250d63ae6a483914f7fddeaa3593030e60ea65c4cfe0
2	SIZE (dvdisaster-0.72.4.tar.bz2) = 5097738	2	SIZE (dvdisaster-0.72.5.tar.bz2) = 5065440




--- ./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..."

Lines 1-3 Link Here

(-)pkg-message (+6 lines)
		1	===============================================================================
		2
		3	dvdisaster has been installed.
		4
1	Note that dvdisaster tries to read /dev/pass* to list available CD/DVD drives,	5	Note that dvdisaster tries to read /dev/pass* to list available CD/DVD drives,
2	so the program will not detect any available drives if the user running	6	so the program will not detect any available drives if the user running
3	dvdisaster does not have permissions to read /dev/pass*	7	dvdisaster does not have permissions to read /dev/pass*
		8
		9	===============================================================================




bin/dvdisaster
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
@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

Return to bug 183838

Lines 2-9 Link Here

(-)Makefile (-20 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dvdisaster	4	PORTNAME= dvdisaster
5	PORTVERSION= 0.72.4	5	PORTVERSION= 0.72.5
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= http://dvdisaster.net/downloads/	7	MASTER_SITES= http://dvdisaster.net/downloads/
9		8
Lines 11-46 Link Here
11	COMMENT= CD/DVD error recovery tool	10	COMMENT= CD/DVD error recovery tool
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING
15		13
16	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash	14	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
17		15
18	MAKEFILE= GNUmakefile	16	MAKEFILE= GNUmakefile
19		17
		18	USES= gmake pkgconfig
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	USES= gettext pkgconfig
22	USE_GNOME= gtk20	20	USE_GNOME= gtk20
		21	CONFIGURE_LOG= configure.log
23	CONFIGURE_ARGS= --prefix=${PREFIX} \	22	CONFIGURE_ARGS= --prefix=${PREFIX} \
24	--docsubdir="/" \	23	--docsubdir="/" \
25	--png-includes=${LOCALBASE}/include \	24	--png-includes=${LOCALBASE}/include \
26	--png-libraries=${LOCALBASE}/lib	25	--png-libraries=${LOCALBASE}/lib \
27	USE_GMAKE= yes	26	--phpmountdir=${LOCALBASE}/www/${PORTNAME} \
28	MAKE_JOBS_UNSAFE=yes	27	--mandir=${PREFIX}/man \
		28	--localedir=${PREFIX}/share/locale \
		29	--buildroot=${STAGEDIR}
		30	MAKE_JOBS_UNSAFE= yes
29		31
30	.if defined(NOPORTDOCS)
31	CONFIGURE_ARGS+= --docdir=${WRKSRC}
32	.else
33	CONFIGURE_ARGS+= --docdir=${DOCSDIR}
34	.endif
35
36	PORTDOCS= *	32	PORTDOCS= *
37		33
38	PORTSCOUT= limitw:1,even	34	OPTIONS_DEFINE= DOCS NLS
		35	OPTIONS_SUB= yes
39		36
40	MAN1= dvdisaster.1	37	DOCS_CONFIGURE_ON= --docdir=${DOCSDIR}
41	MANLANG= "" cs de it	38	DOCS_CONFIGURE_OFF= --docdir=${WRKSRC}
42		39
43	NO_STAGE= yes	40	NLS_USES= gettext
		41
		42	post-patch:
		43	${REINPLACE_CMD} -e '/REQUIRE_GCC/d' ${WRKSRC}/configure ${WRKSRC}/tools/configure
		44
44	do-configure:	45	do-configure:
45	@(cd ${CONFIGURE_WRKSRC} && \	46	@(cd ${CONFIGURE_WRKSRC} && \
46	if ! ${SETENV} CC="${CC}" CXX="${CXX}" \	47	if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
Lines 55-61 Link Here
55	${FALSE}; \	56	${FALSE}; \
56	fi)	57	fi)
57		58
58	post-install:
59	@${CAT} ${PKGMESSAGE}
60
61	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-GNUmakefile.template (+35 lines)
	1	--- ./GNUmakefile.template.orig 2013-11-25 05:07:19.000000000 +0000
	2	+++ ./GNUmakefile.template 2013-11-25 05:08:26.000000000 +0000
	3	@@ -356,19 +356,19 @@
	4	install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
	5	done \
	6	fi
	7	- @echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	8	- @echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	9	- @echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	10	- @echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	11	- @echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	12	- @echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	13	- @for i in $(PO_LOCALES); do \
	14	- echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
	15	- done
	16	- @for i in $(MAN_LOCALES); do \
	17	- echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
	18	- done
	19	- @echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	20	+# @echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	21	+# @echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	22	+# @echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	23	+# @echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	24	+# @echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	25	+# @echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	26	+# @for i in $(PO_LOCALES); do \
	27	+# echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
	28	+# done
	29	+# @for i in $(MAN_LOCALES); do \
	30	+# echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
	31	+# done
	32	+# @echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
	33
	34	uninstall:
	35	@echo "Uninstalling package..."

Lines 1-27 Link Here

(-)pkg-plist (-26 / +10 lines)
1	bin/dvdisaster	1	bin/dvdisaster
2	bin/dvdisaster-uninstall.sh	2	man/cs/man1/dvdisaster.1.gz
3	locale/cs/LC_MESSAGES/dvdisaster.mo	3	man/de/man1/dvdisaster.1.gz
4	locale/de/LC_MESSAGES/dvdisaster.mo	4	man/it/man1/dvdisaster.1.gz
5	locale/it/LC_MESSAGES/dvdisaster.mo	5	man/man1/dvdisaster.1.gz
6	locale/ru/LC_MESSAGES/dvdisaster.mo	6	%%NLS%%share/locale/cs/LC_MESSAGES/dvdisaster.mo
7	locale/sv/LC_MESSAGES/dvdisaster.mo	7	%%NLS%%share/locale/de/LC_MESSAGES/dvdisaster.mo
8	locale/pt_BR/LC_MESSAGES/dvdisaster.mo	8	%%NLS%%share/locale/it/LC_MESSAGES/dvdisaster.mo
9	@dirrm locale/pt_BR/LC_MESSAGES	9	%%NLS%%share/locale/ru/LC_MESSAGES/dvdisaster.mo
10	@dirrm locale/pt_BR	10	%%NLS%%share/locale/sv/LC_MESSAGES/dvdisaster.mo
11	@dirrm locale/sv/LC_MESSAGES	11	%%NLS%%share/locale/pt_BR/LC_MESSAGES/dvdisaster.mo
12	@dirrm locale/sv
13	@dirrm locale/ru/LC_MESSAGES
14	@dirrm locale/ru
15	@dirrm locale/it/LC_MESSAGES
16	@dirrm locale/it
17	@dirrm locale/de/LC_MESSAGES
18	@dirrm locale/de
19	@dirrm locale/cs/LC_MESSAGES
20	@dirrm locale/cs
21	@dirrmtry locale
22	@dirrmtry man/it/man1
23	@dirrmtry man/it
24	@dirrmtry man/de/man1
25	@dirrmtry man/de
26	@dirrmtry man/cs/man1
27	@dirrmtry man/cs