ports/65903: [PATCH] devel/doc++: un-BROKEN and tweak Makefile

[Sam Lawrance]

>Number:         65903
>Category:       ports
>Synopsis:       [PATCH] devel/doc++: un-BROKEN and tweak Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 22 19:40:19 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sam Lawrance
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Mon Mar 29 23:54:35 EST 2004
>Description:
- Port's own prototype of getopt() was conflicting with one from unistd.h,
  so compile with -D__GNU_LIBRARY__ to get a correct/matching prototype.
  (even though the getopt from libc/unistd is not used)
- Move RUN_DEPENDS earlier & tweak to satisfy portlint.
- PORTREVISION++

Port maintainer (Ruslan at Shevchenko.Kiev.UA) is cc'd.

>How-To-Repeat:
>Fix:

--- doc++-3.4.10_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/devel/doc++/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- Makefile	7 Feb 2004 23:29:51 -0000	1.21
+++ Makefile	23 Apr 2004 02:22:01 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	doc++
 PORTVERSION=	3.4.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	docpp
@@ -15,18 +15,18 @@
 MAINTAINER=	Ruslan at Shevchenko.Kiev.UA
 COMMENT=	Javadoc style C++ documentatation system
 
+RUN_DEPENDS=	tex:${PORTSDIR}/print/teTeX \
+		anytopnm:${PORTSDIR}/graphics/netpbm
+
 .if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
-GSPORT?=	print/ghostscript-afpl
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-afpl
 .else
-GSPORT?=	print/ghostscript-gnu
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-afpl
 .endif
 
-RUN_DEPENDS=	tex:${PORTSDIR}/print/teTeX \
-		gs:${PORTSDIR}/${GSPORT} \
-		anytopnm:${PORTSDIR}/graphics/netpbm
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+MAKE_ARGS=	CPPFLAGS=-D__GNU_LIBRARY__
 
 ADDITIONAL_DOCS=	ClassGraph.class \
 			ClassGraphPanel.class \
@@ -64,14 +64,10 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502000
-BROKEN=			"Does not compile"
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	for i in $(ADDITIONAL_DOCS); do \
+	for i in ${ADDITIONAL_DOCS}; do \
 		${INSTALL_MAN} ${WRKSRC}/doc/manual/html/$$i ${DOCSDIR} ;\
 	done
 .endif
--- doc++-3.4.10_2.patch ends here ---

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