Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Aug 2013 18:01:23 +0100 (BST)
From:      Chris Rees <crees@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/181624: Fix port: textproc/docbook-420 dependencies are incorrectly expressed
Message-ID:  <20130828170124.C2D4B326FE@pegasus.bayofrum.net>
Resent-Message-ID: <201308281710.r7SHA168066891@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         181624
>Category:       ports
>Synopsis:       Fix port: textproc/docbook-420 dependencies are incorrectly expressed
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 28 17:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 9.1-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #1 r252227M: Sat Jun 29 13:55:30 BST 2013 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64


	
>Description:
	http://www.bayofrum.net/medusa/tinderlogs/9.1-local-20130828122206/docbook-4.2.log

	When installing docbook-420 it depends on an unzip executable, which is found a /usr/bin/unzip, but it actually uses UNZIP_CMD, which is defined in bsd.commands.mk as ${LOCALBASE}/bin/unzip.

	Also, we do not mute installation commands.

	While here, remove useless check for directory's existence (mkdir -p does not complain if it exists).
>How-To-Repeat:
	
>Fix:

	

--- docbook-420-dependencies.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 325543)
+++ Makefile	(working copy)
@@ -1,12 +1,5 @@
-# New ports collection makefile for:	docbook-420
-# Date created:		29 Oct 2003
-# Whom:			kutulu
-#
-# Based on murray's docbook-410 port
-#     which is based on niks' docbook-310 port
-#
+# Created by: kutulu
 # $FreeBSD$
-#
 
 PORTNAME=	docbook
 PORTVERSION=	4.2
@@ -20,7 +13,8 @@
 RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
 		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+INSTALL_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 USE_ZIP=	yes
 NO_MTREE=	yes
 NO_BUILD=	yes
@@ -38,11 +32,11 @@
 LATEST_LINK=	docbook-420
 
 pre-su-install:
-	@[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION}
+	${MKDIR} ${INSTDIR}/${PORTVERSION}
 
 do-install:
-	@${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION}
-	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog
+	${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION}
+	${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog
 	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
--- docbook-420-dependencies.diff ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130828170124.C2D4B326FE>