Convert to ELF.

3 files changed, 38 insertions, 17 deletions

diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index 5f0f49d3f172..acc11459951b 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -3,7 +3,7 @@
 # Date created:                8 August 1997
 # Whom:                        lukin@okbmei.msk.su
 #
-# $Id: Makefile,v 1.2 1997/11/19 12:18:02 tg Exp $
+# $Id: Makefile,v 1.3 1997/11/19 12:22:01 tg Exp $
 #
 
 DISTNAME=	dnd.1.1
@@ -23,6 +23,6 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/libdnd
 	${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${PREFIX}/share/doc/libdnd
 .endif
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab
index 8a762934dbe7..c09a022ded94 100644
--- a/x11/libdnd/files/patch-ab
+++ b/x11/libdnd/files/patch-ab
@@ -1,6 +1,23 @@
---- Makefile.in.orig	Fri May 23 04:18:22 1997
-+++ Makefile.in	Wed Nov 19 13:11:44 1997
-@@ -23,20 +23,28 @@
+--- Makefile.in.orig	Thu May 22 21:18:22 1997
++++ Makefile.in	Sat Sep 26 21:59:37 1998
+@@ -13,6 +13,16 @@
+ RANLIB = @RANLIB@
+ 
+ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@
++.if $(PORTOBJFORMAT) == "elf"
++LIBS+=		-Wl,-rpath,$(X11BASE)/lib
++SHLDFLAGS=	-shared -x -soname $@
++DNDLIB=		libDnd.so.1
++DNDPLUSLIB=	libDnd++.so.1
++.else
++SHLDFLAGS=	-Bshareable -x
++DNDLIB=		libDnd.so.1.0
++DNDPLUSLIB=	libDnd++.so.1.0
++.endif
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -23,20 +33,30 @@
  CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c
  LINK = $(CC) $(LDFLAGS) -o $@
  
@@ -19,35 +36,37 @@
  	install -d $(LIB_DIR)
 -	install libDnd.a libDnd++.a $(LIB_DIR)
 +	install -c -m 644 libDnd.a libDnd++.a $(LIB_DIR)
-+	install -c libDnd.so.1.0 libDnd++.so.1.0 $(LIB_DIR)
++	install -c $(DNDLIB) $(DNDPLUSLIB) $(LIB_DIR)
++	ln -sf $(DNDLIB) $(LIB_DIR)/libDnd.so
++	ln -sf $(DNDPLUSLIB) $(LIB_DIR)/libDnd++.so
  
  libC: libDnd.a
  
  libCpp: libDnd++.a
  
-+libC-so: libDnd.so.1.0
++libC-so: $(DNDLIB)
 +
-+libCpp-so: libDnd++.so.1.0
++libCpp-so: $(DNDPLUSLIB)
 +
  dndtest: dndtest.c libDnd.a
  	rm -f dndtest
  	$(COMPILE) dndtest.c
-@@ -57,6 +65,16 @@
+@@ -57,6 +77,16 @@
  	$(AR) cru libDnd++.a DragAndDrop.o
  	$(RANLIB) libDnd++.a
  
 -clean:
 -	rm -f *.o *.cxx *.a dndtest *~ *bak
-+libDnd.so.1.0: DragAndDrop.c
++$(DNDLIB): DragAndDrop.c
 +	rm -f DragAndDrop.so 
 +	$(SOCOMPILE) -o DragAndDrop.so DragAndDrop.c
-+	$(LD) -Bshareable -x -o libDnd.so.1.0 DragAndDrop.so
++	$(LD) $(SHLDFLAGS) -o $(DNDLIB) DragAndDrop.so
  
-+libDnd++.so.1.0: DragAndDrop.c
++$(DNDPLUSLIB): DragAndDrop.c
 +	rm -f DragAndDrop.so DragAndDrop.cxx
 +	ln -s DragAndDrop.c DragAndDrop.cxx
 +	$(SOCXXCOMPILE) -o DragAndDrop.so DragAndDrop.cxx
-+	$(LD) -Bshareable -x -o libDnd++.so.1.0 DragAndDrop.so
++	$(LD) $(SHLDFLAGS) -o $(DNDPLUSLIB) DragAndDrop.so
 +
 +clean:
 +	rm -f *.o *.so *.cxx *.a dndtest *~ *bak
diff --git a/x11/libdnd/pkg-plist b/x11/libdnd/pkg-plist
index 2443c985c81b..4124da0c6ef8 100644
--- a/x11/libdnd/pkg-plist
+++ b/x11/libdnd/pkg-plist
@@ -2,10 +2,12 @@ include/OffiX/DragAndDrop.h
 include/OffiX/DragAndDropTypes.h
 lib/libDnd.a
 lib/libDnd++.a
-lib/libDnd.so.1.0
-lib/libDnd++.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libDnd.so
+lib/libDnd.so.1
+lib/libDnd++.so
+lib/libDnd++.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/libdnd/DND.dvi
 share/doc/libdnd/DNDa4.ps
 share/doc/libdnd/DNDletter.ps