4 files changed, 65 insertions, 60 deletions

diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index e47bacccfe4c..7c782d22ca8c 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -3,7 +3,7 @@
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp $
+# $Id: Makefile,v 1.15 1998/06/14 17:31:23 hoek Exp $
 #
 
 DISTNAME=       uudeview-0.5.13
@@ -18,15 +18,16 @@ GNU_CONFIGURE=		yes
 
 MAN3=		uulib.3
 
-ALL_TARGET=	libuu.a	libuu.so.1.0
+ALL_TARGET=	libuu.a	libuu.so.${VERSION}
 
 DOCFILES=	HISTORY doc/Makefile doc/README doc/binhex.fig \
 		doc/library.ltx doc/structure.fig doc/td-v1.c doc/td-v2.c \
 		doc/td-v3.c doc/test.txt
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/uulib/libuu.so.1.0 ${PREFIX}/lib
-	@${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/uulib/libuu.so.${VERSION} ${PREFIX}/lib
+	${LN} -sf libuu.so.${VERSION} ${PREFIX}/lib/libuu.so
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/uulib/libuu.a ${PREFIX}/lib
 	@/usr/bin/ranlib ${PREFIX}/lib/libuu.a
 	${INSTALL_DATA} ${WRKSRC}/uulib/uudeview.h ${PREFIX}/include/uu.h
@@ -42,3 +43,9 @@ do-install:
 .endif
 
 .include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+VERSION=	1
+.else
+VERSION=	1.0
+.endif
diff --git a/converters/uulib/files/patch-aa b/converters/uulib/files/patch-aa
index a8f3f4829631..04b956faad11 100644
--- a/converters/uulib/files/patch-aa
+++ b/converters/uulib/files/patch-aa
@@ -1,39 +1,33 @@
-*** uulib/Makefile.in	Mon Oct 14 16:19:18 1996
---- /devel/ports/new.new.uulib/src/uulib/Makefile.in	Sun Feb  9 23:37:42 1997
-***************
-*** 50,56 ****
-  #
-  
-  .SUFFIXES:
-! .SUFFIXES: .c .o
-  
-  all:		libuu.a
-  
---- 50,56 ----
-  #
-  
-  .SUFFIXES:
-! .SUFFIXES: .c .o .so
-  
-  all:		libuu.a
-  
-***************
-*** 73,80 ****
---- 73,89 ----
-  	ar r $@ $(UULIB_OBJ)
-  	-$(RANLIB) $@
-  
-+ SOBJS=	$(UULIB_OBJ:.o=.so)
-+ libuu.so.1.0:	$(SOBJS)
-+ 	rm -f $(.TARGET)
-+ 	ld -Bshareable -x -o libuu.so.1.0 `lorder $(SOBJS) | tsort -q`
-+ 		
-+ .c.so:
-+ 	$(CC) -fpic -DPIC -c -o $(.TARGET) $(CFLAGS) $(VDEF) $(.IMPSRC)
-+ 
-  .c.o:
-  	$(CC) -c $(CFLAGS) $(VDEF) $<
-+ 
-  
-  uuencode.o:	uuencode.c uudeview.h uuint.h uustring.h fptools.h config.h
-  uulib.o:	uulib.c uudeview.h uuint.h uustring.h fptools.h config.h
+--- uulib/Makefile.in.orig	Mon Oct 14 15:19:18 1996
++++ uulib/Makefile.in	Fri Sep 25 14:49:15 1998
+@@ -50,7 +50,7 @@
+ #
+ 
+ .SUFFIXES:
+-.SUFFIXES: .c .o
++.SUFFIXES: .c .o .so
+ 
+ all:		libuu.a
+ 
+@@ -73,8 +73,21 @@
+ 	ar r $@ $(UULIB_OBJ)
+ 	-$(RANLIB) $@
+ 
++SOBJS=	$(UULIB_OBJ:.o=.so)
++libuu.so.1.0:	$(SOBJS)
++	rm -f $(.TARGET)
++	ld -Bshareable -x -o libuu.so.1.0 `lorder $(SOBJS) | tsort -q`
++
++libuu.so.1:	$(SOBJS)
++	rm -f $(.TARGET)
++	ld -shared -x -soname libuu.so.1 -o libuu.so.1 $(SOBJS)
++
++.c.so:
++	$(CC) -fpic -DPIC -c -o $(.TARGET) $(CFLAGS) $(VDEF) $(.IMPSRC)
++
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $(VDEF) $<
++
+ 
+ uuencode.o:	uuencode.c uudeview.h uuint.h uustring.h fptools.h config.h
+ uulib.o:	uulib.c uudeview.h uuint.h uustring.h fptools.h config.h
diff --git a/converters/uulib/files/patch-ab b/converters/uulib/files/patch-ab
index 8551de5336b5..412895cdb9ca 100644
--- a/converters/uulib/files/patch-ab
+++ b/converters/uulib/files/patch-ab
@@ -1,14 +1,17 @@
-*** Makefile.in	Mon Oct 14 16:19:01 1996
---- /devel/ports/new.new.uulib/src/Makefile.in	Mon Feb 10 00:03:24 1997
-***************
-*** 170,175 ****
---- 170,179 ----
-  libuu.a:	uulib/config.h
-  	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
-  
-+ libuu.so.1.0:	uulib/config.h
-+ 	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \
-+ 		libuu.so.1.0 )
-+ 
-  minews:
-  	(cd inews; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
+--- Makefile.in.orig	Mon Oct 14 15:19:01 1996
++++ Makefile.in	Fri Sep 25 14:53:03 1998
+@@ -170,6 +170,14 @@
+ libuu.a:	uulib/config.h
+ 	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
+ 
++libuu.so.1.0:	uulib/config.h
++	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \
++		libuu.so.1.0 )
++
++libuu.so.1:	uulib/config.h
++	(cd uulib; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' \
++		libuu.so.1 )
++
+ minews:
+ 	(cd inews; $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' LIBS='$(LIBS)' )
+ 
diff --git a/converters/uulib/pkg-plist b/converters/uulib/pkg-plist
index 0f22d6b4dcde..08b1813ef7bc 100644
--- a/converters/uulib/pkg-plist
+++ b/converters/uulib/pkg-plist
@@ -1,6 +1,7 @@
 lib/libuu.a
-lib/libuu.so.1.0
-@unexec /sbin/ldconfig -R
+lib/libuu.so
+lib/libuu.so.1
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/uu.h
 share/doc/uulib/Makefile
 share/doc/uulib/README
@@ -13,5 +14,5 @@ share/doc/uulib/td-v3.c
 share/doc/uulib/test.txt
 share/doc/uulib/porting.notes
 share/doc/uulib/HISTORY
-@exec /sbin/ldconfig -m %D/lib
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @dirrm share/doc/uulib