Index: head/www/cgihtml/Makefile
===================================================================
--- head/www/cgihtml/Makefile	(revision 13711)
+++ head/www/cgihtml/Makefile	(revision 13712)
@@ -1,28 +1,29 @@
 # New ports collection makefile for:	cgihtml
 # Version required:     1.69
 # 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
 
 post-extract:
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/cgihtml/html
 .for file in CHANGES CREDITS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cgihtml
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/cgihtml/html
 .endif
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>

Property changes on: head/www/cgihtml/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/www/cgihtml/files/Makefile
===================================================================
--- head/www/cgihtml/files/Makefile	(revision 13711)
+++ head/www/cgihtml/files/Makefile	(revision 13712)
@@ -1,55 +1,59 @@
 # 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}
 SRCS =	${OBJS:.o=.c}
 SOBJS =	${OBJS:.o=.so}
 
 .SUFFIXES:
 .SUFFIXES: .o .so .c
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 .c.so:
 	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 lib${LIB}.a: ${OBJS}
 	@${ECHO} building standard ${LIB} library
 	@rm -f ${.TARGET}
 	@${AR} cr ${.TARGET} `lorder ${OBJS} | tsort -q`
 	${RANLIB} ${.TARGET}
 
 lib${LIB}.so.${SHLIB_VER}: ${SOBJS}
 	@${ECHO} building shared ${LIB} library \(version ${SHLIB_VER}\)
 	@rm -f ${.TARGET}
 	${CC} -shared -Wl,-x -o ${.TARGET} `lorder ${SOBJS} | tsort -q`
 
 all: depend lib${LIB}.a lib${LIB}.so.${SHLIB_VER}
 
 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
 
 clean:
 	rm -f *.o *.so lib${LIB}.a lib${LIB}.so.${SHLIB_VER}
 
 distclean: clean
 	rm -f .depend
 
 depend:
 	mkdep ${CFLAGS} ${SRCS}
 

Property changes on: head/www/cgihtml/files/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/www/cgihtml/pkg-plist
===================================================================
--- head/www/cgihtml/pkg-plist	(revision 13711)
+++ head/www/cgihtml/pkg-plist	(revision 13712)
@@ -1,19 +1,20 @@
 include/cgi-lib.h
 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
 share/doc/cgihtml/html/cgihtml-2.html
 share/doc/cgihtml/html/cgihtml-3.html
 share/doc/cgihtml/html/cgihtml-4.html
 share/doc/cgihtml/html/cgihtml-5.html
 share/doc/cgihtml/html/cgihtml-6.html
 share/doc/cgihtml/html/cgihtml-7.html
 share/doc/cgihtml/html/cgihtml.html
 @dirrm share/doc/cgihtml/html
 @dirrm share/doc/cgihtml

Property changes on: head/www/cgihtml/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property