From 681c474c763ec3d38189edc777587ef75e04231c Mon Sep 17 00:00:00 2001
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Wed, 7 Oct 1998 15:02:43 +0000
Subject: Convert to elf, And fix the path of MASTER_SITE.

---
 www/cgihtml/Makefile       |  5 +++--
 www/cgihtml/files/Makefile | 12 ++++++++----
 www/cgihtml/pkg-plist      |  5 +++--
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'www')

diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index a9cae50a3368..3da762ebd947 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -3,12 +3,12 @@
 # Date created:		3 Nov 1997
 # Whom:			Ian Vaudrey <i.vaudrey@bigfoot.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/14 12:38:55 jseger Exp $
+# $Id: Makefile,v 1.2 1998/06/27 05:19:48 asami Exp $
 #
 
 DISTNAME=	cgihtml-1.69
 CATEGORIES=	devel www
-MASTER_SITES=	ftp://ftp.eekim.com/users/eekim/cgihtml/
+MASTER_SITES=	ftp://ftp.eekim.com/pub/users/eekim/cgihtml/
 
 MAINTAINER=	i.vaudrey@bigfoot.com
 
@@ -24,5 +24,6 @@ post-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/cgihtml/html
 .endif
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/www/cgihtml/files/Makefile b/www/cgihtml/files/Makefile
index d5a528d3b9b7..6b5f879b534c 100644
--- a/www/cgihtml/files/Makefile
+++ b/www/cgihtml/files/Makefile
@@ -1,8 +1,13 @@
 # Makefile for cgihtml libraries
 
-CFLAGS= -O #-DUPLOADDIR='"/tmp"'
 LIB = cgihtml
-SHLIB_VER = 1.0
+MAJ = 1
+MIN = 0
+.if ($(PORTOBJFORMAT) == "elf")
+SHLIB_VER = $(MAJ)
+.else
+SHLIB_VER = $(MAJ).$(MIN)
+.endif
 
 OBJS = string-lib.o cgi-llist.o cgi-lib.o html-lib.o
 HDRS =	${OBJS:.o=.h}
@@ -37,9 +42,8 @@ install:
 	@mkdir -p ${PREFIX}/lib
 	@mkdir -p ${PREFIX}/include
 	${INSTALL} -c -m 644 lib${LIB}.a ${PREFIX}/lib
-	${RANLIB} -t ${PREFIX}/lib/lib${LIB}.a
+#	${RANLIB} -t ${PREFIX}/lib/lib${LIB}.a
 	${INSTALL} -c -m 644 lib${LIB}.so.${SHLIB_VER} ${PREFIX}/lib
-	/sbin/ldconfig -m ${PREFIX}/lib
 .for file in ${HDRS}
 	${INSTALL} -c -m 644 ${file} ${PREFIX}/include
 .endfor
diff --git a/www/cgihtml/pkg-plist b/www/cgihtml/pkg-plist
index 944f7a25387f..2a9ed7794e85 100644
--- a/www/cgihtml/pkg-plist
+++ b/www/cgihtml/pkg-plist
@@ -3,8 +3,9 @@ include/cgi-llist.h
 include/html-lib.h
 include/string-lib.h
 lib/libcgihtml.a
-lib/libcgihtml.so.1.0
-@exec /sbin/ldconfig -m %B
+lib/libcgihtml.so.1
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/doc/cgihtml/CHANGES
 share/doc/cgihtml/CREDITS
 share/doc/cgihtml/html/cgihtml-1.html
-- 
cgit v1.2.3