Bug 186715 - [PATCH] sysutils/dvdisaster: don't silence warnings
Summary: [PATCH] sysutils/dvdisaster: don't silence warnings
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rusmir Dusko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-13 02:30 UTC by Dmitry Marakasov
Modified: 2014-02-23 23:20 UTC (History)
1 user (show)

See Also:


Attachments
dvdisaster-0.72.5.patch (430 bytes, patch)
2014-02-13 02:30 UTC, Dmitry Marakasov
no flags Details | Diff
dvdisaster.diff (8.15 KB, patch)
2014-02-23 20:47 UTC, Horia Racoviceanu
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Marakasov 2014-02-13 02:30:00 UTC
- Don't silence warnings

Port maintainer (horia@racoviceanu.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer 2014-02-13 02:30:12 UTC
Maintainer of sysutils/dvdisaster,

Please note that PR ports/186715 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186715

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2014-02-13 02:30:13 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Horia Racoviceanu 2014-02-23 20:47:22 UTC
I approve this patch with modifications. Thank you.

- Don't silence warnings [1]
- Add cairo to USE_GNOME
- Add GNU_CONFIGURE
- Add --mandir to CONFIGURE_ARGS
- Add EFENCE and MEMDEBUG to Options
- Patch DOCS to fix build on FreeBSD 10 i386
- Patch NLS to work with DOCS in other languages
- Consolidate patches in Makefile
- Strip executable
Comment 4 Rusmir Dusko freebsd_committer 2014-02-23 20:51:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

I'll take it.
Comment 5 Rusmir Dusko freebsd_committer 2014-02-23 22:13:52 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 6 dfilter service freebsd_committer 2014-02-23 23:10:43 UTC
Author: nemysis
Date: Sun Feb 23 23:10:35 2014
New Revision: 345775
URL: http://svnweb.freebsd.org/changeset/ports/345775
QAT: https://qat.redports.org/buildarchive/r345775/

Log:
  - Bump PORTREVISION
  - Add USE_GNOME=cairo and GNU_CONFIGURE=yes
  - Remove --mandir from CONFIGURE_ARGS (redundant)
  - Add EFENCE and MEMDEBUG to Group Options and
    dependency
  - Don't silence warnings [1]
  - Consolidate patches in Makefile, remove obsolete pathes
  - Patch DOCS to fix build on FreeBSD 10 i386
  - Patch NLS to work with DOCS in other languages
  - Strip executable
  - Add instructions for ATAPI drives on FreeBSD 9.x in pkg-message
  
  PR:		ports/186715 [1]
  Submitted by:	amdmi3@

Deleted:
  head/sysutils/dvdisaster/files/
Modified:
  head/sysutils/dvdisaster/Makefile
  head/sysutils/dvdisaster/pkg-message

Modified: head/sysutils/dvdisaster/Makefile
==============================================================================
--- head/sysutils/dvdisaster/Makefile	Sun Feb 23 22:20:05 2014	(r345774)
+++ head/sysutils/dvdisaster/Makefile	Sun Feb 23 23:10:35 2014	(r345775)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dvdisaster
 PORTVERSION=	0.72.5
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dvdisaster.net/downloads/
 
@@ -17,14 +18,14 @@ MAKEFILE=	GNUmakefile
 
 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="/" \
 		--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 @@ MAKE_JOBS_UNSAFE=	yes
 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)
+
+post-install:
+.if ! ${PORT_OPTIONS:MEFENCE} || ! ${PORT_OPTIONS:MMEMDEBUG}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/sysutils/dvdisaster/pkg-message
==============================================================================
--- head/sysutils/dvdisaster/pkg-message	Sun Feb 23 22:20:05 2014	(r345774)
+++ head/sysutils/dvdisaster/pkg-message	Sun Feb 23 23:10:35 2014	(r345775)
@@ -6,4 +6,38 @@ Note that dvdisaster tries to read /dev/
 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.
+
 ===============================================================================
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"