From stas@mbsd.msk.ru  Thu Jul 13 18:13:58 2006
Return-Path: <stas@mbsd.msk.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9415C16A4DE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Jul 2006 18:13:53 +0000 (UTC)
	(envelope-from stas@mbsd.msk.ru)
Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6031F43D73
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Jul 2006 18:13:25 +0000 (GMT)
	(envelope-from stas@mbsd.msk.ru)
Received: from [213.87.72.70] (helo=fonon.realnet)
	by com1.ht-systems.ru with esmtpa (Exim 4.62)
	(envelope-from <stas@mbsd.msk.ru>)
	id 1G15oD-0003xq-GR
	for FreeBSD-gnats-submit@freebsd.org; Thu, 13 Jul 2006 22:21:16 +0400
Received: by fonon.realnet (Postfix, from userid 1001)
	id 4C69D126A1; Thu, 13 Jul 2006 21:31:57 +0400 (MSD)
Message-Id: <20060713173157.4C69D126A1@fonon.realnet>
Date: Thu, 13 Jul 2006 21:31:57 +0400 (MSD)
From: Stanislav Sedov <ssedov@mbsd.msk.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER PATCH] cad/geda: fix installdirs, add options
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         100228
>Category:       ports
>Synopsis:       [MAINTAINER PATCH] cad/geda: fix installdirs, add options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 13 18:20:31 GMT 2006
>Closed-Date:    Sun Jul 16 04:06:05 GMT 2006
>Last-Modified:  Sun Jul 16 04:06:05 GMT 2006
>Originator:     Stanislav Sedov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006
>Description:
 - Fix installdirs to address geda directory structure unification
 - add options to select docs/examples

Note: this also depends on geda-symbols PR
>How-To-Repeat:
>Fix:

--- geda-20060123_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/geda/Makefile /var/tmp/work2/geda/Makefile
--- /usr/ports/cad/geda/Makefile	Wed Jun 28 11:51:26 2006
+++ /var/tmp/work2/geda/Makefile	Thu Jul 13 21:04:31 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	geda
 PORTVERSION=	20060123
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -15,7 +16,7 @@
 MAINTAINER=	ssedov@mbsd.msk.ru
 COMMENT=	The "meta-port" for gEDA
 
-RUN_DEPENDS=	${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols \
+RUN_DEPENDS=	${DATADIR}/sym:${PORTSDIR}/cad/geda-symbols \
 		gschem:${PORTSDIR}/cad/gschem \
 		gnetlist:${PORTSDIR}/cad/gnetlist \
 		gmk_sym:${PORTSDIR}/cad/geda-utils \
@@ -24,6 +25,17 @@
 		geda:${PORTSDIR}/cad/geda-projectmanager
 
 NO_BUILD=	yes
+
+OPTIONS=	EXAMPLES	"Install gEDA's examples"	on \
+		DOCS		"Install gEDA's documentation"	on
+
+.if !defined(WITHOUT_EXAMPLES)
+RUN_DEPENDS+=	${EXAMPLESDIR}/README:${PORTSDIR}/cad/geda-examples
+.endif
+
+.if !defined(WITHOUT_DOCS)
+RUN_DEPENDS+=	${DOCSDIR}/attributes/index.html:${PORTSDIR}/cad/geda-docs
+.endif
 
 do-install:	# empty
 
--- geda-20060123_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Thu Jul 13 20:00:39 UTC 2006 
Responsible-Changed-Why:  
Eat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100228 

From: Stanislav Sedov <ssedov@mbsd.msk.ru>
To: bug-followup@freebsd.org, Rong-En Fan <rafan@FreeBSD.org>
Cc:  
Subject: Re: ports/100228: [MAINTAINER PATCH] cad/geda: fix installdirs, add
 options
Date: Fri, 14 Jul 2006 22:29:33 +0400

 Updated diff that takes into account repocopy changes.
 --------------------------------------------------------
 diff -ruN --exclude=CVS /tmp/ports/cad/geda/Makefile geda/Makefile
 --- /tmp/ports/cad/geda/Makefile	Wed Jun 28 11:51:26 2006
 +++ geda/Makefile	Fri Jul 14 22:22:22 2006
 @@ -7,6 +7,7 @@
  
  PORTNAME=	geda
  PORTVERSION=	20060123
 +PORTREVISION=	1
  CATEGORIES=	cad
  MASTER_SITES=	# empty
  DISTFILES=	# none
 @@ -15,15 +16,26 @@
  MAINTAINER=	ssedov@mbsd.msk.ru
  COMMENT=	The "meta-port" for gEDA
  
 -RUN_DEPENDS=
 ${LOCALBASE}/share/gEDA/sym:${PORTSDIR}/cad/geda-symbols \
 -		gschem:${PORTSDIR}/cad/gschem \
 -		gnetlist:${PORTSDIR}/cad/gnetlist \
 +RUN_DEPENDS=	${DATADIR}/sym:${PORTSDIR}/cad/geda-symbols \
 +		gschem:${PORTSDIR}/cad/geda-gschem \
 +		gnetlist:${PORTSDIR}/cad/geda-netlist \
  		gmk_sym:${PORTSDIR}/cad/geda-utils \
  		gsymcheck:${PORTSDIR}/cad/geda-symcheck \
  		gattrib:${PORTSDIR}/cad/geda-gattrib \
  		geda:${PORTSDIR}/cad/geda-projectmanager
  
  NO_BUILD=	yes
 +
 +OPTIONS=	EXAMPLES	"Install gEDA's examples"	on \
 +		DOCS		"Install gEDA's
 documentation"	on
 +
 +.if !defined(WITHOUT_EXAMPLES)
 +RUN_DEPENDS+=
 ${EXAMPLESDIR}/README:${PORTSDIR}/cad/geda-examples
 +.endif
 +
 +.if !defined(WITHOUT_DOCS)
 +RUN_DEPENDS+=
 ${DOCSDIR}/attributes/index.html:${PORTSDIR}/cad/geda-docs
 +.endif
  
  do-install:	# empty
  
 --------------------------------------------------------
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Sun Jul 16 04:06:04 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100228 
>Unformatted:
