- Fix MASTER_SITES

- Support CC properly
- Remove obsolete WWW: line from pkg-descr

PR:		43697
Submitted by:	Ports Fury

4 files changed, 38 insertions, 16 deletions

diff --git a/devel/ecgi/Makefile b/devel/ecgi/Makefile
index ae660aa27dce..8df00fb0cfda 100644
--- a/devel/ecgi/Makefile
+++ b/devel/ecgi/Makefile
@@ -5,16 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=       ecgi
+PORTNAME=	ecgi
 PORTVERSION=	0.6.2
-CATEGORIES=     devel
-MASTER_SITES=   http://www.global-owl.com/ecgi/download/
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.debian.org/debian/pool/main/libe/libecgi/
+DISTNAME=	lib${PORTNAME}_${PORTVERSION}.orig
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 HEADER_FILES=	ecgi.h ecgitk.h include/memfile.h
@@ -23,16 +26,16 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/src/memfile.c
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/libecgi.a ${PREFIX}/lib
-	@${INSTALL_PROGRAM} ${WRKSRC}/libecgi.so ${PREFIX}/lib
-	@${INSTALL_PROGRAM} ${WRKSRC}/html2h/html2h ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libecgi.a ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/libecgi.so ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/html2h/html2h ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/include/ecgi
 .for file in ${HEADER_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ecgi
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include/ecgi
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ecgi
-	@${INSTALL_DATA} ${WRKSRC}/doc/ecgitut.txt ${PREFIX}/share/doc/ecgi
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ecgitut.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ecgi/distinfo b/devel/ecgi/distinfo
index 3b04580ff1d9..6d4f68aa1ab8 100644
--- a/devel/ecgi/distinfo
+++ b/devel/ecgi/distinfo
@@ -1 +1 @@
-MD5 (ecgi-0.6.2.tar.gz) = 1d2b17b1e0540b34f704ffedb9d154e5
+MD5 (libecgi_0.6.2.orig.tar.gz) = 1d2b17b1e0540b34f704ffedb9d154e5
diff --git a/devel/ecgi/files/patch-Makefile b/devel/ecgi/files/patch-Makefile
index 19a535ac36de..8cc13b2a8177 100644
--- a/devel/ecgi/files/patch-Makefile
+++ b/devel/ecgi/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Feb 13 23:46:51 2001
-+++ Makefile	Tue Feb 13 23:47:50 2001
+--- Makefile.orig	Tue Feb 13 22:02:11 2001
++++ Makefile	Wed Aug 14 05:20:36 2002
 @@ -1,14 +1,14 @@
  SHAREDOPT = -shared
 -LIBDIR = /usr/lib
@@ -21,7 +21,15 @@
  
  shared: libecgi.so
  	cp libecgi.so /usr/lib
-@@ -26,25 +26,25 @@
+@@ -19,32 +19,32 @@
+ 	printf "\n\n***congratulations - compilation worked***\n***       run 'make install' now       ***\n\n"
+ 
+ libecgi.so: obj/ecgi.o obj/ecgitk.o
+-	gcc $(SHAREDOPT) obj/ecgi.o obj/memfile.o obj/ecgitk.o -o libecgi.so
++	$(CC) $(SHAREDOPT) obj/ecgi.o obj/memfile.o obj/ecgitk.o -o libecgi.so
+ 
+ install:
+ 	cp libecgi.a $(LIBDIR)
  	cp ecgi.h $(INCDIR)
  	cp include/memfile.h $(INCDIR)
  	cp ecgitk.h $(INCDIR)
diff --git a/devel/ecgi/files/patch-src::ecgitk.c b/devel/ecgi/files/patch-src::ecgitk.c
new file mode 100644
index 000000000000..8edef5c5735d
--- /dev/null
+++ b/devel/ecgi/files/patch-src::ecgitk.c
@@ -0,0 +1,11 @@
+--- src/ecgitk.c.orig	Tue Feb 13 21:09:37 2001
++++ src/ecgitk.c	Sat Sep 14 01:22:11 2002
+@@ -23,7 +23,7 @@
+ {
+ 	char buf[4096];
+ 	int used;
+-	va_list *ap;
++	va_list ap;
+ 	
+ 	va_start(ap, (void*)format);
+ 	used=vsnprintf(buf, 4095, format, ap);