From Ruslan@Shevchenko.Kiev.UA Sat Feb 20 12:04:50 1999
Return-Path: <Ruslan@Shevchenko.Kiev.UA>
Received: from gvinpin.grad.kiev.ua (KievglavArhit-UTC-28k8.ukrtel.net [195.5.25.54])
	by hub.freebsd.org (Postfix) with ESMTP id 5AB12119A2
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Feb 1999 12:00:03 -0800 (PST)
	(envelope-from Ruslan@Shevchenko.Kiev.UA)
Received: from Shevchenko.Kiev.UA (kulshedra [10.0.1.99])
	by gvinpin.grad.kiev.ua (8.8.7/8.8.7) with ESMTP id VAA20263
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Feb 1999 21:59:47 +0200
Message-Id: <36CF14B4.94DE8479@Shevchenko.Kiev.UA>
Date: Sat, 20 Feb 1999 22:01:56 +0200
From: Ruslan Shevchenko <Ruslan@Shevchenko.Kiev.UA>
Sender: rssh@gvinpin.grad.kiev.ua
Reply-To: rssh@grad.kiev.ua
To: FreeBSD-gnats-submit@freebsd.org
Subject: upgrade of devel/doc++ port

>Number:         10176
>Category:       ports
>Synopsis:       [PATCH] upgrade of devel/doc++ port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 20 12:10:01 PST 1999
>Closed-Date:    Sun May 2 18:51:40 PDT 1999
>Last-Modified:  Sun May  2 18:53:22 PDT 1999
>Originator:     Ruslan Shevchenko
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
Local Paradise
>Environment:

        any FreeBSD

>Description:

        upgrade of devel/doc++ port

>How-To-Repeat:

         
      
>Fix:
        
   attached to this message
--------------82A3327897F3B0407F545907
Content-Type: text/plain; charset=koi8-r; name="doc++.port.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="doc++.port.diff"

diff -udr doc++.orig/Makefile doc++/Makefile
--- doc++.orig/Makefile	Sat Feb 20 21:04:22 1999
+++ doc++/Makefile	Sat Feb 20 21:53:10 1999
@@ -1,15 +1,14 @@
 # New ports collection makefile for:	DOC++
 # Date created:		20 Dec 1998
 # Whom:			Ruslan@Shevchenko.Kiev.UA
-# Version required:	3.2
+# Version required:	3.3.9
 #
 # $Id: Makefile,v 1.1.1.1 1998/12/26 05:00:45 steve Exp $
 #
 
-DISTNAME=	docxxsrc
-PKGNAME=	doc++-3.2
+DISTNAME=	doc++-3.3.9
 CATEGORIES=	devel
-MASTER_SITES=	http://www.zib.de/Visual/software/doc++/
+MASTER_SITES=	http://www.imaginator.com/doc++/
 
 MAINTAINER=	Ruslan@Shevchenko.Kiev.UA
 
@@ -17,15 +16,7 @@
 		gs:${PORTSDIR}/print/ghostscript5 \
 		anytopnm:${PORTSDIR}/graphics/netpbm
 
-WRKSRC=		${WRKDIR}/src
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-
-do-build:
-	(cd ${WRKSRC}; gmake ${MAKE_ENV} all CXX=gcc LD=gcc LDFLAGS=-lstdc++ )
-
-do-install:
-	for i in ${WRKSRC}/bin/`uname -s`/*; do \
-	  ${INSTALL_PROGRAM} $$i ${PREFIX}/bin ; \
-	done
 
 .include <bsd.port.mk>
diff -udr doc++.orig/files/md5 doc++/files/md5
--- doc++.orig/files/md5	Sat Feb 20 21:04:21 1999
+++ doc++/files/md5	Sat Feb 20 21:09:50 1999
@@ -1 +1 @@
-MD5 (docxxsrc.tar.gz) = 5c6f133f7dd8b7db582ea157d541bd12
+MD5 (doc++-3.3.9.tar.gz) = b1fcee088450ab55ed9b1d7b8c853d4e
diff -udr doc++.orig/patches/patch-aa doc++/patches/patch-aa
--- doc++.orig/patches/patch-aa	Sat Feb 20 21:04:22 1999
+++ doc++/patches/patch-aa	Sat Feb 20 21:42:26 1999
@@ -1,20 +1,22 @@
---- Makefile.orig	Tue Sep 15 10:34:14 1998
-+++ Makefile	Fri Dec 25 10:08:50 1998
-@@ -4,7 +4,7 @@
- CXX 	= 
- CC 	=
- LIB	= lib
--UNAME	:= $(shell uname -s)
-+UNAME	= FreeBSD
- 
- ifeq ($(UNAME),IRIX64)
-     UNAME = IRIX
-@@ -151,7 +151,7 @@
- 	-chgrp vispar depend
- 	-chmod g+w depend
- 
---include	depend
-+include	depend
- 
- #-------------------------------------------------------------------------
- docify.cpp:	docify.l
+diff -udr doc++-3.3.9.orig/src/html.cc doc++-3.3.9/src/html.cc
+--- src/html.cc.orig	Sat Feb 20 21:37:56 1999
++++ src/html.cc	Sat Feb 20 21:38:21 1999
+@@ -645,7 +645,7 @@
+ 	if(e->parent)
+           if(e->ownPage)
+ 	    {
+-			if(e->fileName&&strlen(e->fileName))
++			if((const char*)(e->fileName)&&strlen(e->fileName))
+ 				link += e->fileName;
+ 			else{
+ 	    		link += e->hname;
+@@ -655,7 +655,8 @@
+ 	    }
+ 	   else
+ 	    {
+-			if(e->parent->fileName&&strlen(e->fileName))
++			if((const char*)(e->parent->fileName)&&
++                            strlen(e->fileName))
+ 				link += e->parent->fileName;
+ 			else{
+ 	    		link += e->parent->hname;
diff -udr doc++.orig/pkg/COMMENT doc++/pkg/COMMENT
--- doc++.orig/pkg/COMMENT	Sat Feb 20 21:04:22 1999
+++ doc++/pkg/COMMENT	Sat Feb 20 21:49:04 1999
@@ -1 +1 @@
-javadoc style documentatation system for FreeBSD
+javadoc style C++ documentatation system.
diff -udr doc++.orig/pkg/DESCR doc++/pkg/DESCR
--- doc++.orig/pkg/DESCR	Sat Feb 20 21:04:22 1999
+++ doc++/pkg/DESCR	Sat Feb 20 21:50:06 1999
@@ -1,4 +1,4 @@
 DOC++ is a source documentation system for C++.
 It is jenerated javadoc-like documentatio in HTML and LaTeX.
-for more info, please, refer to 
-     http://www.zib.de/Visual/software/doc++/index.html
+for more info, please, refer to :
+     http://www.imaginator.com/doc++/

--------------82A3327897F3B0407F545907--


>Release-Note:
>Audit-Trail:

From: Bill Fumerola <billf@chc-chimes.com>
To: rssh@grad.kiev.ua
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/10176: upgrade of devel/doc++ port
Date: Sat, 20 Feb 1999 15:42:24 -0500 (EST)

 On Sat, 20 Feb 1999, Ruslan Shevchenko wrote:
 
 > diff -udr doc++.orig/patches/patch-aa doc++/patches/patch-aa
 > --- doc++.orig/patches/patch-aa	Sat Feb 20 21:04:22 1999
 > +++ doc++/patches/patch-aa	Sat Feb 20 21:42:26 1999
 > @@ -1,20 +1,22 @@
 > ---- Makefile.orig	Tue Sep 15 10:34:14 1998
 > -+++ Makefile	Fri Dec 25 10:08:50 1998
 
 > +diff -udr doc++-3.3.9.orig/src/html.cc doc++-3.3.9/src/html.cc
 > +--- src/html.cc.orig	Sat Feb 20 21:37:56 1999
 > ++++ src/html.cc	Sat Feb 20 21:38:21 1999
 
 If I read this correctly (embedded patches can throw me off sometimes)
 you're replacing the old patch-aa, which patched Makefile, with a new
 patch-aa which patches html.cc...
 
 Don't do that. Indicate that you want patch-aa removed, and make a new
 patch-ab.
 
 - bill fumerola - billf@chc-chimes.com - BF1560 - computer horizons corp -
 - ph:(800) 252-2421 - bfumerol@computerhorizons.com - billf@FreeBSD.org  -
 
 
 
 

From: Ruslan Shevchenko <Ruslan@Shevchenko.Kiev.UA>
To: Bill Fumerola <billf@chc-chimes.com>
Cc: rssh@grad.kiev.ua, FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/10176: upgrade of devel/doc++ port
Date: Sat, 20 Feb 1999 22:49:59 +0200

 This is a multi-part message in MIME format.
 --------------AF7CEDAFD29E58988A99DDBE
 Content-Type: text/plain; charset=koi8-r
 Content-Transfer-Encoding: 7bit
 
 Bill Fumerola wrote:
 > 
 > On Sat, 20 Feb 1999, Ruslan Shevchenko wrote:
 
 > If I read this correctly (embedded patches can throw me off sometimes)
 > you're replacing the old patch-aa, which patched Makefile, with a new
 > patch-aa which patches html.cc...
 > 
 > Don't do that. Indicate that you want patch-aa removed, and make a new
 > patch-ab.
 >
 
 O'k. new diff and patch-ab is attached:
 
  
 > - bill fumerola - billf@chc-chimes.com - BF1560 - computer horizons corp -
 > - ph:(800) 252-2421 - bfumerol@computerhorizons.com - billf@FreeBSD.org  -
 --------------AF7CEDAFD29E58988A99DDBE
 Content-Type: text/plain; charset=koi8-r; name="doc++.port.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="doc++.port.diff"
 
 diff -udr doc++.orig/Makefile doc++/Makefile
 --- doc++.orig/Makefile	Sat Feb 20 21:04:22 1999
 +++ doc++/Makefile	Sat Feb 20 21:53:10 1999
 @@ -1,15 +1,14 @@
  # New ports collection makefile for:	DOC++
  # Date created:		20 Dec 1998
  # Whom:			Ruslan@Shevchenko.Kiev.UA
 -# Version required:	3.2
 +# Version required:	3.3.9
  #
  # $Id: Makefile,v 1.1.1.1 1998/12/26 05:00:45 steve Exp $
  #
  
 -DISTNAME=	docxxsrc
 -PKGNAME=	doc++-3.2
 +DISTNAME=	doc++-3.3.9
  CATEGORIES=	devel
 -MASTER_SITES=	http://www.zib.de/Visual/software/doc++/
 +MASTER_SITES=	http://www.imaginator.com/doc++/
  
  MAINTAINER=	Ruslan@Shevchenko.Kiev.UA
  
 @@ -17,15 +16,7 @@
  		gs:${PORTSDIR}/print/ghostscript5 \
  		anytopnm:${PORTSDIR}/graphics/netpbm
  
 -WRKSRC=		${WRKDIR}/src
 +GNU_CONFIGURE=	yes
  USE_GMAKE=	yes
 -
 -do-build:
 -	(cd ${WRKSRC}; gmake ${MAKE_ENV} all CXX=gcc LD=gcc LDFLAGS=-lstdc++ )
 -
 -do-install:
 -	for i in ${WRKSRC}/bin/`uname -s`/*; do \
 -	  ${INSTALL_PROGRAM} $$i ${PREFIX}/bin ; \
 -	done
  
  .include <bsd.port.mk>
 diff -udr doc++.orig/files/md5 doc++/files/md5
 --- doc++.orig/files/md5	Sat Feb 20 21:04:21 1999
 +++ doc++/files/md5	Sat Feb 20 21:09:50 1999
 @@ -1 +1 @@
 -MD5 (docxxsrc.tar.gz) = 5c6f133f7dd8b7db582ea157d541bd12
 +MD5 (doc++-3.3.9.tar.gz) = b1fcee088450ab55ed9b1d7b8c853d4e
 Only in doc++.orig/patches: patch-aa
 Only in doc++/patches: patch-ab
 diff -udr doc++.orig/pkg/COMMENT doc++/pkg/COMMENT
 --- doc++.orig/pkg/COMMENT	Sat Feb 20 21:04:22 1999
 +++ doc++/pkg/COMMENT	Sat Feb 20 21:49:04 1999
 @@ -1 +1 @@
 -javadoc style documentatation system for FreeBSD
 +javadoc style C++ documentatation system.
 diff -udr doc++.orig/pkg/DESCR doc++/pkg/DESCR
 --- doc++.orig/pkg/DESCR	Sat Feb 20 21:04:22 1999
 +++ doc++/pkg/DESCR	Sat Feb 20 21:50:06 1999
 @@ -1,4 +1,4 @@
  DOC++ is a source documentation system for C++.
  It is jenerated javadoc-like documentatio in HTML and LaTeX.
 -for more info, please, refer to 
 -     http://www.zib.de/Visual/software/doc++/index.html
 +for more info, please, refer to :
 +     http://www.imaginator.com/doc++/
 
 --------------AF7CEDAFD29E58988A99DDBE
 Content-Type: text/plain; charset=koi8-r; name="patch-ab"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename="patch-ab"
 
 diff -udr doc++-3.3.9.orig/src/html.cc doc++-3.3.9/src/html.cc
 --- src/html.cc.orig	Sat Feb 20 21:37:56 1999
 +++ src/html.cc	Sat Feb 20 21:38:21 1999
 @@ -645,7 +645,7 @@
  	if(e->parent)
            if(e->ownPage)
  	    {
 -			if(e->fileName&&strlen(e->fileName))
 +			if((const char*)(e->fileName)&&strlen(e->fileName))
  				link += e->fileName;
  			else{
  	    		link += e->hname;
 @@ -655,7 +655,8 @@
  	    }
  	   else
  	    {
 -			if(e->parent->fileName&&strlen(e->fileName))
 +			if((const char*)(e->parent->fileName)&&
 +                            strlen(e->fileName))
  				link += e->parent->fileName;
  			else{
  	    		link += e->parent->hname;
 
 --------------AF7CEDAFD29E58988A99DDBE--
 
 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun May 2 18:51:40 PDT 1999 
State-Changed-Why:  
Update committed, thanks!  I went ahead and updated to version 3.3.11 
since the other version was no longer available. 
>Unformatted:
 This is a multi-part message in MIME format.
 --------------82A3327897F3B0407F545907
 Content-Type: text/plain; charset=koi8-r
 Content-Transfer-Encoding: 7bit
 
