* The patch for rev 1.18 did not make it to Freefall. Fix that.

* fix the symlinking so `make reinstall' works
* change how the symlinking is done to produce a more esthetic link

2 files changed, 20 insertions, 1 deletions

diff --git a/devel/libgnugetopt/Makefile b/devel/libgnugetopt/Makefile
index 1424c88682c7..f11b03683804 100644
--- a/devel/libgnugetopt/Makefile
+++ b/devel/libgnugetopt/Makefile
@@ -25,6 +25,6 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/getopt.h ${PREFIX}/include
 	@ ${INSTALL_DATA} ${WRKSRC}/libgnugetopt.a ${PREFIX}/lib
 	@ ${INSTALL_DATA} ${WRKSRC}/libgnugetopt.so.1 ${PREFIX}/lib
-	@ ${LN} -s ${PREFIX}/lib/libgnugetopt.so.1 ${PREFIX}/lib/libgnugetopt.so
+	@ cd ${PREFIX}/lib ; ${LN} -sf libgnugetopt.so.1 libgnugetopt.so
 
 .include <bsd.port.mk>
diff --git a/devel/libgnugetopt/files/patch-Makefile b/devel/libgnugetopt/files/patch-Makefile
new file mode 100644
index 000000000000..8c82373f86a6
--- /dev/null
+++ b/devel/libgnugetopt/files/patch-Makefile
@@ -0,0 +1,19 @@
+--- Makefile.orig	Mon May  3 00:33:35 1999
++++ Makefile	Sun Mar 11 14:59:36 2001
+@@ -2,10 +2,15 @@
+ # GNU getopt library
+ #
+ 
+-all: libgnugetopt.so.1
++all: libgnugetopt.so.1 libgnugetopt.a
+ 
+ libgnugetopt.so.1: getopt.o getopt1.o
+ 	${CC} ${CFLAGS} -shared -Wl,-soname,libgnugetopt.so.1 -o libgnugetopt.so.1 getopt.o getopt1.o
++
++libgnugetopt.a: getopt.o getopt1.o
++	@echo building static libgnugetopt library
++	ar cq libgnugetopt.a `lorder getopt.o getopt1.o | tsort -q`
++	ranlib libgnugetopt.a
+ 
+ getopt1.o: getopt1.c
+ 	${CC} ${CFLAGS} -fPIC -o getopt1.o -c -s getopt1.c