From tilman@arved.de  Sat Sep 28 08:35:16 2002
Return-Path: <tilman@arved.de>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3BEB937B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Sep 2002 08:35:16 -0700 (PDT)
Received: from 21322530218.direct.eti.at (21322530218.direct.eti.at [213.225.30.218])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 335EC43E6A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Sep 2002 08:35:15 -0700 (PDT)
	(envelope-from tilman@arved.de)
Received: from sauna.arved.de (sauna.arved.de [192.168.2.4])
	by 21322530218.direct.eti.at (8.12.5/8.12.5) with ESMTP id g8SFeoW9013642
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Sep 2002 17:40:51 +0200 (CEST)
	(envelope-from tilman@arved.de)
Received: from sauna.arved.de (sauna.arved.de [127.0.0.1])
	by sauna.arved.de (8.12.5/8.12.5) with ESMTP id g8SFZCB1056986;
	Sat, 28 Sep 2002 17:35:12 +0200 (CEST)
	(envelope-from tilman@sauna.arved.de)
Received: (from tilman@localhost)
	by sauna.arved.de (8.12.5/8.12.5/Submit) id g8SFZBJu056985;
	Sat, 28 Sep 2002 17:35:11 +0200 (CEST)
Message-Id: <200209281535.g8SFZBJu056985@sauna.arved.de>
Date: Sat, 28 Sep 2002 17:35:11 +0200 (CEST)
From: Tilman Linneweh <tilman@arved.de>
Reply-To: Tilman Linneweh <tilman@arved.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tilman@arved.de
Subject: Unbreak misc/gman
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43453
>Category:       ports
>Synopsis:       Unbreak misc/gman
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 28 08:40:02 PDT 2002
>Closed-Date:    Thu Jan 02 21:58:36 PST 2003
>Last-Modified:  Thu Jan 02 21:58:36 PST 2003
>Originator:     Tilman Linneweh
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
BSD Usergroup Austria
>Environment:
System: FreeBSD sauna.arved.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jul 7 20:02:41 CEST 2002 tilman@sauna.arved.de:/usr/obj/usr/src/sys/SAUNA i386


	
>Description:
	Unbreak by giving this ugly program a betterconnected MASTER_SITE
	Fix plist
	PERL -> REINPLACE_CMD
	Add Author to pkg-descr
	Make patch-Makefile obsolete by replacing it with Regex.
	
>How-To-Repeat:
	
>Fix:

	
	Remove patch-Makefile

--- gman.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/gman/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	20 Sep 2002 21:13:51 -0000	1.6
+++ Makefile	28 Sep 2002 15:29:26 -0000
@@ -9,23 +9,31 @@
 PORTNAME=	gman
 PORTVERSION=	0.9.3
 CATEGORIES=	misc
-MASTER_SITES=	http://homex.coolconnect.com/user/xkwang/gman/
+MASTER_SITES=	http://stud3.tuwien.ac.at/~e0025974/distfiles/ \
+		http://homex.coolconnect.com/user/xkwang/gman/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=		"Does not fetch"
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	ghostview:${PORTSDIR}/print/ghostview
 
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
+USE_REINPLACE=	yes
 
 MAN1=	gman.1x
 
 post-patch:
-	@${PERL} -pi -e "s,^CXX =,#CXX =,g ; s,^CXXFLAGS =,CXXFLAGS+=,g ; \
-		s,gtk-config,${GTK_CONFIG},g ; s,= /usr,= ${PREFIX},g ; \
-		s,/var/www,${LOCALBASE}/www,g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,^CXX =,#CXX =,g ; s,^CXXFLAGS =,CXXFLAGS+=,g ; \
+	s,gtk-config,${GTK_CONFIG},g ; s,= /usr,= ${PREFIX},g ;s,\-O2,,g ; \
+	s,\-lgtk \-lgdk \-lpthread ,`${GTK_CONFIG} \-\-libs gthread` ,g;' \ 
+		${WRKSRC}/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gman ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/bin/gman.cgi
+	${MKDIR} ${PREFIX}/www/cgi-bin/gman
+	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/www/cgi-bin/gman
+	${INSTALL_MAN} ${WRKSRC}/gman.1x ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/misc/gman/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	30 Mar 2001 16:49:35 -0000	1.1
+++ pkg-descr	28 Sep 2002 15:04:26 -0000
@@ -2,4 +2,5 @@
 designed for the new users of UNIX. It can help a newbie find specific
 information or idly browse other man pages.
 
+Author: Xinkai Wang <aakwxk@hotmail.com> 
 WWW: http://homex.coolconnect.com/user/xkwang/gman/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/gman/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	10 Jun 2002 04:25:02 -0000	1.2
+++ pkg-plist	28 Sep 2002 15:14:06 -0000
@@ -1,3 +1,4 @@
 bin/gman
 bin/gman.cgi
-www/cgi-bin/gman
+www/cgi-bin/gman/gman.pl
+@dirrm www/cgi-bin/gman
--- gman.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Kris Kennaway <kris@obsecurity.org>
To: Tilman Linneweh <tilman@arved.de>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/43453: Unbreak misc/gman
Date: Sat, 28 Sep 2002 22:40:52 -0700

 On Sat, Sep 28, 2002 at 05:35:11PM +0200, Tilman Linneweh wrote:
 
 > 	PERL -> REINPLACE_CMD
 
 This seems to break for me:
 
 sed: lstat: No such file or directory
 
 I have MAKEOBJDIRPREFIX set in /etc/make.conf to move WRKDIR elsewhere.
 
 Kris

From: Tilman Linneweh <tilman@arved.de>
To: Kris Kennaway <kris@obsecurity.org>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/43453: Unbreak misc/gman
Date: Sun, 29 Sep 2002 17:27:17 +0200

 * Kris Kennaway <kris@obsecurity.org> [Sat, 28 Sep 2002 22:40:52 -0700]:
 
 > On Sat, Sep 28, 2002 at 05:35:11PM +0200, Tilman Linneweh wrote:
 > 
 > > 	PERL -> REINPLACE_CMD
 > 
 > This seems to break for me:
 > 
 > sed: lstat: No such file or directory
 > 
 > I have MAKEOBJDIRPREFIX set in /etc/make.conf to move WRKDIR elsewhere.
 
 You mean the line gets too long for the shell?
 
 If splitted it into two.
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/misc/gman/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- Makefile	28 Sep 2002 18:19:39 -0000	1.7
 +++ Makefile	29 Sep 2002 15:23:23 -0000
 @@ -9,7 +9,8 @@
  PORTNAME=	gman
  PORTVERSION=	0.9.3
  CATEGORIES=	misc
 -MASTER_SITES=	http://homex.coolconnect.com/user/xkwang/gman/
 +MASTER_SITES=	http://stud3.tuwien.ac.at/~e0025974/distfiles/ \
 +		http://homex.coolconnect.com/user/xkwang/gman/
  
  MAINTAINER=	ports@FreeBSD.org
  
 @@ -18,12 +19,22 @@
  
  USE_GNOMENG=	yes
  USE_GNOME=	gtk12
 +USE_REINPLACE=	yes
  
  MAN1=	gman.1x
  
  post-patch:
 -	@${PERL} -pi -e "s,^CXX =,#CXX =,g ; s,^CXXFLAGS =,CXXFLAGS+=,g ; \
 -		s,gtk-config,${GTK_CONFIG},g ; s,= /usr,= ${PREFIX},g ; \
 -		s,/var/www,${LOCALBASE}/www,g" ${WRKSRC}/Makefile
 +	${REINPLACE_CMD} -e 's,^CXX =,#CXX =,g ; s,^CXXFLAGS =,CXXFLAGS+=,g ; \
 +	s,gtk-config,${GTK_CONFIG},g ; s,= /usr,= ${PREFIX},g ;s,\-O2,,g ;' \
 +	${WRKSRC}/Makefile	
 +	${REINPLACE_CMD} -e 's,\-lgtk \-lgdk \-lpthread ,`${GTK_CONFIG} \-\-libs gthread` ,g;' \
 +	${WRKSRC}/Makefile 
 +
 +do-install:
 +	${INSTALL_PROGRAM} ${WRKSRC}/gman ${PREFIX}/bin
 +	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/bin/gman.cgi
 +	${MKDIR} ${PREFIX}/www/cgi-bin/gman
 +	${INSTALL_SCRIPT} ${WRKSRC}/gman.pl ${PREFIX}/www/cgi-bin/gman
 +	${INSTALL_MAN} ${WRKSRC}/gman.1x ${MANPREFIX}/man/man1
  
  .include <bsd.port.mk>
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/misc/gman/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr	30 Mar 2001 16:49:35 -0000	1.1
 +++ pkg-descr	28 Sep 2002 15:04:26 -0000
 @@ -2,4 +2,5 @@
  designed for the new users of UNIX. It can help a newbie find specific
  information or idly browse other man pages.
  
 +Author: Xinkai Wang <aakwxk@hotmail.com> 
  WWW: http://homex.coolconnect.com/user/xkwang/gman/
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/misc/gman/pkg-plist,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-plist
 --- pkg-plist	10 Jun 2002 04:25:02 -0000	1.2
 +++ pkg-plist	28 Sep 2002 15:14:06 -0000
 @@ -1,3 +1,4 @@
  bin/gman
  bin/gman.cgi
 -www/cgi-bin/gman
 +www/cgi-bin/gman/gman.pl
 +@dirrm www/cgi-bin/gman
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Thu Jan 2 21:58:13 PST 2003 
State-Changed-Why:  
committed, thanks 

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