This broke somewhere along the way (-shared was slipping in when

building the binaries).  Fix it.

4 files changed, 56 insertions, 32 deletions

diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index 17447822d1da..e5432e412be9 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -27,14 +27,13 @@ GNU_CONFIGURE=		YES
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == elf
-SHLIB=libhesiod.so.3
-CONFIGURE_ENV+=		LDFLAGS="-shared -Wl,-soname,${SHLIB}"
+VERSION=3
+SONAME="-Wl,-soname,libhesiod.so.${VERSION}"
 .else
-SHLIB=libhesiod.so.3.0
-CONFIGURE_ENV+=		LDFLAGS="-shared"
+VERSION=3.0
 .endif
 
-MAKE_ENV+=		SHLIB="${SHLIB}"
+MAKE_ENV+=		VERSION="${VERSION}" SONAME="${SONAME}"
 
 post-install:
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/dns/hesiod/files/patch-aa b/dns/hesiod/files/patch-aa
index 828e32f794d5..3dcb8dfc6155 100644
--- a/dns/hesiod/files/patch-aa
+++ b/dns/hesiod/files/patch-aa
@@ -1,33 +1,46 @@
 --- Makefile.in.orig	Fri Jan  3 15:02:55 1997
-+++ Makefile.in	Wed Oct  7 11:43:17 1998
-@@ -24,12 +24,15 @@
++++ Makefile.in	Mon Oct  4 12:29:32 1999
+@@ -24,17 +24,24 @@
  ALL_CFLAGS=-I. -DSYSCONFDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS}
  OBJS=hesiod.o hesmailhost.o hespwnam.o hesservbyname.o hescompat.o
  
 -all: libhesiod.a hesinfo hestest
-+all: libhesiod.a hesinfo hestest ${SHLIB}
++all: libhesiod.so.${VERSION} libhesiod.so hesinfo hestest libhesiod.a
  
  libhesiod.a: ${OBJS}
  	ar cru $@ ${OBJS}
  	${RANLIB} $@
  
-+${SHLIB}: ${OBJS}
-+	${CC} ${LDFLAGS} ${OBJS} -o ${SHLIB}
+-hesinfo: hesinfo.o libhesiod.a
+-	${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.a ${LIBS}
++libhesiod.so.${VERSION}: ${OBJS}
++	${CC} -shared ${LDFLAGS} ${SONAME} ${OBJS} -o $@
+ 
+-hestest: hestest.o libhesiod.a
+-	${CC} ${LDFLAGS} -o $@ hestest.o libhesiod.a ${LIBS}
++libhesiod.so: libhesiod.so.${VERSION}
++	rm -f $@
++	ln $> $@
++
++hesinfo: hesinfo.o ${SHLIB}
++	${CC} ${LDFLAGS} -o $@ hesinfo.o -L. -lhesiod ${LIBS}
 +
- hesinfo: hesinfo.o libhesiod.a
- 	${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.a ${LIBS}
++hestest: hestest.o ${SHLIB}
++	${CC} ${LDFLAGS} -o $@ hestest.o -L. -lhesiod ${LIBS}
+ 
+ ${OBJS}: hesiod.h resscan.h
  
-@@ -55,6 +58,9 @@
+@@ -55,6 +62,9 @@
  	${INSTALL} -c -m 644 libhesiod.a ${DESTDIR}${libdir}
  	${RANLIB} ${DESTDIR}${libdir}/libhesiod.a
  	chmod u-w ${DESTDIR}${libdir}/libhesiod.a
-+	${INSTALL} -c -m 444 ${SHLIB} ${DESTDIR}${libdir}
-+	ln -f -s ${DESTDIR}${libdir}/${SHLIB} \
++	${INSTALL} -c -m 444 libhesiod.so.${VERSION} ${DESTDIR}${libdir}
++	ln -f -s ${DESTDIR}${libdir}/libhesiod.so.${VERSION} \
 +		${DESTDIR}${libdir}/libhesiod.so
  	${INSTALL_PROGRAM} -c -m 555 hesinfo ${DESTDIR}${lbindir}
  	${INSTALL} -c -m 444 ${srcdir}/hesiod.h ${DESTDIR}${includedir}
  	${INSTALL} -c -m 444 ${srcdir}/hesinfo.1 ${DESTDIR}${mandir}/man1
-@@ -85,7 +93,8 @@
+@@ -85,7 +95,8 @@
  	${INSTALL} -c -m 444 ${srcdir}/hesiod.conf.5 ${DESTDIR}${mandir}/man5
  
  clean:
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index 17447822d1da..e5432e412be9 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -27,14 +27,13 @@ GNU_CONFIGURE=		YES
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == elf
-SHLIB=libhesiod.so.3
-CONFIGURE_ENV+=		LDFLAGS="-shared -Wl,-soname,${SHLIB}"
+VERSION=3
+SONAME="-Wl,-soname,libhesiod.so.${VERSION}"
 .else
-SHLIB=libhesiod.so.3.0
-CONFIGURE_ENV+=		LDFLAGS="-shared"
+VERSION=3.0
 .endif
 
-MAKE_ENV+=		SHLIB="${SHLIB}"
+MAKE_ENV+=		VERSION="${VERSION}" SONAME="${SONAME}"
 
 post-install:
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/net/hesiod/files/patch-aa b/net/hesiod/files/patch-aa
index 828e32f794d5..3dcb8dfc6155 100644
--- a/net/hesiod/files/patch-aa
+++ b/net/hesiod/files/patch-aa
@@ -1,33 +1,46 @@
 --- Makefile.in.orig	Fri Jan  3 15:02:55 1997
-+++ Makefile.in	Wed Oct  7 11:43:17 1998
-@@ -24,12 +24,15 @@
++++ Makefile.in	Mon Oct  4 12:29:32 1999
+@@ -24,17 +24,24 @@
  ALL_CFLAGS=-I. -DSYSCONFDIR=\"${sysconfdir}\" ${CPPFLAGS} ${CFLAGS}
  OBJS=hesiod.o hesmailhost.o hespwnam.o hesservbyname.o hescompat.o
  
 -all: libhesiod.a hesinfo hestest
-+all: libhesiod.a hesinfo hestest ${SHLIB}
++all: libhesiod.so.${VERSION} libhesiod.so hesinfo hestest libhesiod.a
  
  libhesiod.a: ${OBJS}
  	ar cru $@ ${OBJS}
  	${RANLIB} $@
  
-+${SHLIB}: ${OBJS}
-+	${CC} ${LDFLAGS} ${OBJS} -o ${SHLIB}
+-hesinfo: hesinfo.o libhesiod.a
+-	${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.a ${LIBS}
++libhesiod.so.${VERSION}: ${OBJS}
++	${CC} -shared ${LDFLAGS} ${SONAME} ${OBJS} -o $@
+ 
+-hestest: hestest.o libhesiod.a
+-	${CC} ${LDFLAGS} -o $@ hestest.o libhesiod.a ${LIBS}
++libhesiod.so: libhesiod.so.${VERSION}
++	rm -f $@
++	ln $> $@
++
++hesinfo: hesinfo.o ${SHLIB}
++	${CC} ${LDFLAGS} -o $@ hesinfo.o -L. -lhesiod ${LIBS}
 +
- hesinfo: hesinfo.o libhesiod.a
- 	${CC} ${LDFLAGS} -o $@ hesinfo.o libhesiod.a ${LIBS}
++hestest: hestest.o ${SHLIB}
++	${CC} ${LDFLAGS} -o $@ hestest.o -L. -lhesiod ${LIBS}
+ 
+ ${OBJS}: hesiod.h resscan.h
  
-@@ -55,6 +58,9 @@
+@@ -55,6 +62,9 @@
  	${INSTALL} -c -m 644 libhesiod.a ${DESTDIR}${libdir}
  	${RANLIB} ${DESTDIR}${libdir}/libhesiod.a
  	chmod u-w ${DESTDIR}${libdir}/libhesiod.a
-+	${INSTALL} -c -m 444 ${SHLIB} ${DESTDIR}${libdir}
-+	ln -f -s ${DESTDIR}${libdir}/${SHLIB} \
++	${INSTALL} -c -m 444 libhesiod.so.${VERSION} ${DESTDIR}${libdir}
++	ln -f -s ${DESTDIR}${libdir}/libhesiod.so.${VERSION} \
 +		${DESTDIR}${libdir}/libhesiod.so
  	${INSTALL_PROGRAM} -c -m 555 hesinfo ${DESTDIR}${lbindir}
  	${INSTALL} -c -m 444 ${srcdir}/hesiod.h ${DESTDIR}${includedir}
  	${INSTALL} -c -m 444 ${srcdir}/hesinfo.1 ${DESTDIR}${mandir}/man1
-@@ -85,7 +93,8 @@
+@@ -85,7 +95,8 @@
  	${INSTALL} -c -m 444 ${srcdir}/hesiod.conf.5 ${DESTDIR}${mandir}/man5
  
  clean: