From nobody@FreeBSD.org  Tue Mar  9 19:52:22 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB42B16A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  9 Mar 2004 19:52:22 -0800 (PST)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D0BA43D48
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  9 Mar 2004 19:52:22 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.10/8.12.10) with ESMTP id i2A3qM72045219
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 9 Mar 2004 19:52:22 -0800 (PST)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.10/8.12.10/Submit) id i2A3qM3d045216;
	Tue, 9 Mar 2004 19:52:22 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200403100352.i2A3qM3d045216@www.freebsd.org>
Date: Tue, 9 Mar 2004 19:52:22 -0800 (PST)
From: michael johnson <ahze@ahze.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [Maintainer] lang/pnet* -- add PORTDOCS and missing lib for X support.
X-Send-Pr-Version: www-2.3

>Number:         64027
>Category:       ports
>Synopsis:       [Maintainer] lang/pnet* -- add PORTDOCS and missing lib for X support.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 09 20:00:35 PST 2004
>Closed-Date:    Wed Mar 10 15:56:06 PST 2004
>Last-Modified:  Wed Mar 10 15:56:06 PST 2004
>Originator:     michael johnson
>Release:        
>Organization:
>Environment:
>Description:
add RUN_DEPENDS= libXext so we can use gui programs

add PORTDOCS to pnet-base & pnetlib

I chose RUN_DEPENDS instead of LIB_DEPENDS for libXext because it does not need it to build.

I did not bump the PORTREVISION on ml-pnet & pnetc because they are unaffected.

please close and do not comment pr-63969
>How-To-Repeat:
      
>Fix:
diff -ruN lang/pnet.orig/Makefile lang/pnet/Makefile
--- lang/pnet.orig/Makefile	Tue Mar  9 22:11:55 2004
+++ lang/pnet/Makefile	Tue Mar  9 22:36:25 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnet
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	${PNET_REVISION}
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -20,6 +21,10 @@
 		csunit:${PORTSDIR}/lang/pnetlib \
 		sqlsharp-pnet:${PORTSDIR}/lang/ml-pnet \
 		${LOCALBASE}/lib/cscc/lib/libc64.dll:${PORTSDIR}/lang/pnetc
+
+.if !defined(NO_X)
+RUN_DEPENDS+=	${X11BASE}/lib/libXext.so.6:${PORTSDIR}/x11/libXext
+.endif
 
 NO_BUILD=	yes
 
diff -ruN lang/pnet.orig/Makefile.pnet lang/pnet/Makefile.pnet
--- lang/pnet.orig/Makefile.pnet	Tue Mar  9 22:11:55 2004
+++ lang/pnet/Makefile.pnet	Tue Mar  9 22:14:12 2004
@@ -1,5 +1,5 @@
 PNET_VERSION=   0.6.2
-PNET_REVISION=  0
+PNET_REVISION=  1
 PNET_PORTVER=   ${PNET_VERSION}.${PNET_REVISION}
 PNET_PORTREV=   0
 PNET_PORTEPOCH= 0




diff -ruN lang/pnet-base.orig/Makefile lang/pnet-base/Makefile
--- lang/pnet-base.orig/Makefile	Tue Mar  9 22:15:49 2004
+++ lang/pnet-base/Makefile	Tue Mar  9 22:22:36 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnet
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	${PNET_REVISION}
 CATEGORIES=	lang
 MASTER_SITES=	${PNET_MASTER_SITES}
 PKGNAMESUFFIX=	base
@@ -27,6 +28,10 @@
 CONFIGURE_ARGS+=	--disable-optimizations
 .endif
 
+DOC_FILES=	ChangeLog-1 ChangeLog-2 ChangeLog-3 ChangeLog-4 Doxyfile \
+	c_language_abi.html c_users_guide.html embedded.html gtk-sharp.HOWTO \
+	l10n.html libgc_changes.txt pinvoke.html pnet_faq.html pnetasm.texi \
+	unrolling.txt
 INFO=	pnettools
 MAN1=	clrwrap.1 csant.1 cscc.1 csdoc.1 csdoc2hier.1 csdoc2html.1 \
 	csdoc2texi.1 cssrc2html.1 ilalink.1 ilasm.1 ildasm.1 ildd.1 \
@@ -35,6 +40,13 @@
 
 .include <bsd.port.pre.mk>
 
+.ifndef(PORTDOCS)
+.for plistfile in ${DOC_FILES}
+PLIST_FILES+=	share/doc/${PORTNAME}/${plistfile}
+.endfor
+PLIST_DIRS+=	share/doc/${PORTNAME}
+.endif
+
 post-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG} "Define optimized CFLAGS with"
@@ -44,6 +56,14 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|`$$CC -print-multi-os-directory 2>/dev/null`|elf|' \
 		${WRKSRC}/libffi/configure ${WRKSRC}/libffi/configure.in
+
+post-install:
+.ifndef(PORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for docfile in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR}
+.endfor
+.endif
 
 .include "${.CURDIR}/../pnet/Makefile.pnet"
 .include <bsd.port.post.mk>



diff -ruN lang/pnetlib.orig/Makefile lang/pnetlib/Makefile
--- lang/pnetlib.orig/Makefile	Tue Mar  9 22:23:44 2004
+++ lang/pnetlib/Makefile	Tue Mar  9 22:27:40 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	pnetlib
 PORTVERSION=	${PNET_VERSION}
+PORTREVISION=	${PNET_REVISION}
 CATEGORIES=	lang
 MASTER_SITES=	${PNET_MASTER_SITES}
 
@@ -20,10 +21,28 @@
 USE_GMAKE=	yes
 STRIP=		# Nothing to be stripped.
 
+DOC_FILES=	ChangeLog-1 ChangeLog-2 ChangeLog-3 ChangeLog-4 \
+	JScript-embed.txt JScript-internals.txt csunit_howto.html \
+	pcf-font-format.txt translating-pnetlib.txt
+
 .include <bsd.port.pre.mk>
+
+.ifndef(PORTDOCS)
+.for plistfile in ${DOC_FILES}
+PLIST_FILES+=	share/doc/${PORTNAME}/${plistfile}
+.endfor
+PLIST_DIRS+=	share/doc/${PORTNAME}
+.endif
+
 post-install:
 	${STRIP_CMD} ${PREFIX}/lib/cscc/lib/libXsharpSupport.so.0
 	${STRIP_CMD} ${PREFIX}/lib/cscc/lib/libXsharpSupport.a
+.ifndef(PORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for docfile in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR}
+.endfor
+.endif
 
 .include "${.CURDIR}/../pnet/Makefile.pnet"
 .include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:

From: Michael Johnson <ahze@ahze.net>
To: freebsd-ports-bugs@FreeBSD.org, FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/64027: [Maintainer] lang/pnet* -- add PORTDOCS and missing lib for X support.
Date: Tue, 9 Mar 2004 23:09:45 -0500

 actually, I don't know what I was thinking about BUILD_DEPENDS vs. 
 LIB_DEPENDS
 in lang/pnet/Makefile for pnet uses X* libs and headers to compile
 
 please change the following from my patch in lang/pnet/Makefile
 
 .if !defined(NO_X)
 -RUN_DEPENDS+=   ${X11BASE}/lib/libXext.so.6:${PORTSDIR}/x11/libXext
 +LIB_DEPENDS+=   Xext.6:${PORTSDIR}/x11/libXext
 .endif
 
 and add the following to lang/pnet-base/Makefile
 
 .if !defined(NO_X)
 LIB_DEPENDS+=   Xext.6:${PORTSDIR}/x11/libXext
 .endif
 

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: michael johnson <ahze@ahze.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/64027: [Maintainer] lang/pnet* -- add PORTDOCS and missing
 lib for X support.
Date: Wed, 10 Mar 2004 10:39:54 +0100

 michael johnson wrote:
 
 > +.ifndef(PORTDOCS)
 > +.for plistfile in ${DOC_FILES}
 > +PLIST_FILES+=	share/doc/${PORTNAME}/${plistfile}
 > +.endfor
 > +PLIST_DIRS+=	share/doc/${PORTNAME}
 > +.endif
 > +
 
 You could write
   PORTDOCS=	${DOC_FILES}
 instead
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Mar 10 14:16:35 PST 2004 
Responsible-Changed-Why:  
I'm working on this with submitter 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64027 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Mar 10 15:55:59 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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