Update to version 1.07

PR: 26235
Submitted by: Ports Fury

5 files changed, 40 insertions, 57 deletions

diff --git a/www/cgic/Makefile b/www/cgic/Makefile
index 366878815ada..a30c239d4f25 100644
--- a/www/cgic/Makefile
+++ b/www/cgic/Makefile
@@ -6,32 +6,25 @@
 #
 
 PORTNAME=	cgic
-PORTVERSION=	1.06
+PORTVERSION=	1.07
 CATEGORIES=	www
 MASTER_SITES=	http://www.boutell.com/cgic/
-DISTNAME=	${PORTNAME}106
-EXTRACT_SUFX=	.tar.Z
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
 
-ALL_TARGET=	libcgic.so.1
-
-do-install:
-	@ ${INSTALL_DATA} ${WRKSRC}/cgic.h ${PREFIX}/include
-	@ ${INSTALL_DATA} ${WRKSRC}/libcgic.so.1 ${PREFIX}/lib
-	@ ${LN} -s ${PREFIX}/lib/libcgic.so.1 ${PREFIX}/lib/libcgic.so
-	@ ${MKDIR} ${PREFIX}/share/examples/cgic
-	@ ${INSTALL_DATA} ${WRKSRC}/capture.c ${PREFIX}/share/examples/cgic
-	@ ${INSTALL_DATA} ${WRKSRC}/cgictest.c ${PREFIX}/share/examples/cgic
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/cgic
-.for file in cgic.html cgic.txt license.txt readme.txt support.txt testform.html
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cgic
-.endfor
+	@${MKDIR} ${PREFIX}/share/examples/cgic
+	${INSTALL_DATA} ${WRKSRC}/capture.c ${PREFIX}/share/examples/cgic
+	${INSTALL_DATA} ${WRKSRC}/cgictest.c ${PREFIX}/share/examples/cgic
+	@${MKDIR} ${PREFIX}/share/doc/cgic
+	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/cgic
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/cgic
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/cgic/distinfo b/www/cgic/distinfo
index 569c65b80f6a..88626ec4d5b0 100644
--- a/www/cgic/distinfo
+++ b/www/cgic/distinfo
@@ -1 +1 @@
-MD5 (cgic106.tar.Z) = 84d67045866991359da9ab51a3c3345f
+MD5 (cgic107.tar.gz) = fd93c66491022c3dd051537e39e8c9b0
diff --git a/www/cgic/files/Makefile.lib b/www/cgic/files/Makefile.lib
new file mode 100644
index 000000000000..def67c9c8dff
--- /dev/null
+++ b/www/cgic/files/Makefile.lib
@@ -0,0 +1,18 @@
+LIB=		cgic
+
+SHLIB_MAJOR?=	1
+NOPROFILE=	yes
+
+LIBDIR=		${PREFIX}/lib
+INCDIR=		${PREFIX}/include
+CFLAGS+=	-I${.CURDIR}
+
+SRCS=		cgic.c
+
+HEADERS=	cgic.h
+
+afterinstall:
+	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+		${HEADERS} ${INCDIR}
+
+.include <bsd.lib.mk>
diff --git a/www/cgic/files/patch-aa b/www/cgic/files/patch-aa
deleted file mode 100644
index c13d472a32bd..000000000000
--- a/www/cgic/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile	Fri Feb 16 00:20:09 1996
-+++ /home/andy/tmp/wrk/Makefile	Tue Jul 27 15:40:18 1999
-@@ -3,16 +3,15 @@
- #or the system() function, respectively. Non-unix systems
- #will also definitely have different linker syntax.
- 
--CFLAGS=
--CC=gcc
-+#CFLAGS=
-+#CC=gcc
- AR=ar
- LIBS=-L./ -lcgic
- 
- all: libcgic.a cgictest capture
- 
--libcgic.a: cgic.o cgic.h
--	rm -f libcgic.a
--	$(AR) rc libcgic.a cgic.o
-+libcgic.so.1: cgic.o
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,libcgic.so.1 -o libcgic.so.1 cgic.o
- 
- cgictest: cgictest.o libcgic.a
- 	gcc cgictest.o -o cgictest ${LIBS}
-@@ -20,3 +19,5 @@
- capture: capture.o libcgic.a
- 	gcc capture.o -o capture ${LIBS}
- 
-+cgic.o: cgic.c cgic.h
-+	$(CC) $(CFLAGS) -fPIC -o cgic.o -c -s cgic.c
diff --git a/www/cgic/pkg-plist b/www/cgic/pkg-plist
index cd8bb0572a12..ecc963e3312c 100644
--- a/www/cgic/pkg-plist
+++ b/www/cgic/pkg-plist
@@ -1,13 +1,14 @@
 include/cgic.h
+lib/libcgic.a
 lib/libcgic.so
 lib/libcgic.so.1
-share/doc/cgic/cgic.html
-share/doc/cgic/cgic.txt
-share/doc/cgic/license.txt
-share/doc/cgic/readme.txt
-share/doc/cgic/support.txt
-share/doc/cgic/testform.html
-share/examples/cgic/capture.c
-share/examples/cgic/cgictest.c
-@dirrm share/doc/cgic
-@dirrm share/examples/cgic
+%%PORTDOCS%%share/doc/cgic/cgic.html
+%%PORTDOCS%%share/doc/cgic/cgic.txt
+%%PORTDOCS%%share/doc/cgic/license.txt
+%%PORTDOCS%%share/doc/cgic/readme.txt
+%%PORTDOCS%%share/doc/cgic/support.txt
+%%PORTDOCS%%share/doc/cgic/testform.html
+%%PORTDOCS%%share/examples/cgic/capture.c
+%%PORTDOCS%%share/examples/cgic/cgictest.c
+%%PORTDOCS%%@dirrm share/examples/cgic
+%%PORTDOCS%%@dirrm share/doc/cgic