From 70f8cff508717d62b6e404c4982839c13d4bbfe2 Mon Sep 17 00:00:00 2001 From: Rusmir Dusko Date: Wed, 8 Jan 2014 16:13:03 +0000 Subject: - Update to 0.72.5 [1] - Pass maintainership to submitter - Remove LICENSE_FILE [1] - USES gmake instead of USE_GMAKE [1] - Change CONFIGURE_ARGS [1] - Remove PORTSCOUT [1] - Support STAGEDIR and add OPTIONS_SUB [1] - Add DOCS and NLS Option [1] - Use NLS_USES=gettext instead of USES=gettext [1] - Fix build with Clang [1] - Disable all warnings with -w - Add patch and REINPLACE_CMD, fix bad C++ code - Add patch-GNUmakefile.template, adjust install [1] - Change pkg-message [1] PR: ports/183838 [1] Submitted by: Horia Racoviceanu Approved by: maintainer (Corey Halpin ) --- sysutils/dvdisaster/Makefile | 51 ++++++++++++---------- sysutils/dvdisaster/distinfo | 4 +- .../dvdisaster/files/patch-GNUmakefile.template | 35 +++++++++++++++ sysutils/dvdisaster/files/patch-tools__memory.c | 11 +++++ sysutils/dvdisaster/pkg-message | 6 +++ sysutils/dvdisaster/pkg-plist | 36 +++++---------- 6 files changed, 91 insertions(+), 52 deletions(-) create mode 100644 sysutils/dvdisaster/files/patch-GNUmakefile.template create mode 100644 sysutils/dvdisaster/files/patch-tools__memory.c (limited to 'sysutils/dvdisaster') diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile index c2cd77ddd8ec..1bf9c95c6ed2 100644 --- a/sysutils/dvdisaster/Makefile +++ b/sysutils/dvdisaster/Makefile @@ -2,45 +2,51 @@ # $FreeBSD$ PORTNAME= dvdisaster -PORTVERSION= 0.72.4 -PORTREVISION= 1 +PORTVERSION= 0.72.5 CATEGORIES= sysutils MASTER_SITES= http://dvdisaster.net/downloads/ -MAINTAINER= chalpin@cs.wisc.edu +MAINTAINER= horia@racoviceanu.com 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 - -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+= --docdir=${WRKSRC} -.else -CONFIGURE_ARGS+= --docdir=${DOCSDIR} -.endif + --png-libraries=${LOCALBASE}/lib \ + --phpmountdir=${LOCALBASE}/www/${PORTNAME} \ + --mandir=${PREFIX}/man \ + --localedir=${PREFIX}/share/locale \ + --buildroot=${STAGEDIR} +MAKE_JOBS_UNSAFE= yes PORTDOCS= * -PORTSCOUT= limitw:1,even +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + +DOCS_CONFIGURE_ON= --docdir=${DOCSDIR} +DOCS_CONFIGURE_OFF= --docdir=${WRKSRC} -MAN1= dvdisaster.1 -MANLANG= "" cs de it +NLS_USES= gettext + +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 + ${REINPLACE_CMD} -e 's|(ctx)|(*ctx)|' \ + ${WRKSRC}/md5.c -NO_STAGE= yes do-configure: @(cd ${CONFIGURE_WRKSRC} && \ if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ @@ -50,12 +56,9 @@ do-configure: 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}; \ + ${ECHO_CMD} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + ${FALSE}; \ fi) -post-install: - @${CAT} ${PKGMESSAGE} - .include diff --git a/sysutils/dvdisaster/distinfo b/sysutils/dvdisaster/distinfo index 89147531ef2b..29498d367e26 100644 --- a/sysutils/dvdisaster/distinfo +++ b/sysutils/dvdisaster/distinfo @@ -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 diff --git a/sysutils/dvdisaster/files/patch-GNUmakefile.template b/sysutils/dvdisaster/files/patch-GNUmakefile.template new file mode 100644 index 000000000000..8dfb1e186e01 --- /dev/null +++ b/sysutils/dvdisaster/files/patch-GNUmakefile.template @@ -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..." diff --git a/sysutils/dvdisaster/files/patch-tools__memory.c b/sysutils/dvdisaster/files/patch-tools__memory.c new file mode 100644 index 000000000000..f2911f1f2760 --- /dev/null +++ b/sysutils/dvdisaster/files/patch-tools__memory.c @@ -0,0 +1,11 @@ +--- ./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