4 files changed, 68 insertions, 4 deletions

diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index ea726759486f..1a141a617517 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	argp-standalone
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/misc/ \
 		${MASTER_SITE_LOCAL}
@@ -16,12 +17,26 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Standalone version of arguments parsing functions from GLIBC
 
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal:110 autoconf:262 automake:110 libtool:15
+AUTOMAKE_ARGS=	-c -a
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
+USE_LDCONFIG=	yes
 
-PLIST_FILES=	lib/libargp.a include/argp.h
+PLIST_FILES=	lib/libargp.la lib/libargp.a \
+		lib/libargp.so lib/libargp.so.0 \
+		include/argp.h
+
+.include <bsd.port.pre.mk>
+
+pre-configure:
+	@cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake
 
 do-install:
 	@cd ${WRKSRC}; \
-	${INSTALL_DATA} libargp.a ${PREFIX}/lib; \
-	${INSTALL_DATA} argp.h ${PREFIX}/include
+	${INSTALL_DATA} argp.h ${PREFIX}/include; \
+	${INSTALL_DATA} .libs/libargp.la ${PREFIX}/lib; \
+	${INSTALL_DATA} .libs/libargp.a ${PREFIX}/lib; \
+	${INSTALL_PROGRAM} .libs/libargp.so.0 ${PREFIX}/lib
+	@cd ${PREFIX}/lib && ${LN} -sf libargp.so.0 libargp.so
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/argp-standalone/files/patch-Makefile.am b/devel/argp-standalone/files/patch-Makefile.am
new file mode 100644
index 000000000000..d3e4107490e7
--- /dev/null
+++ b/devel/argp-standalone/files/patch-Makefile.am
@@ -0,0 +1,28 @@
+--- Makefile.am.orig	2009-05-28 15:19:50.000000000 +0200
++++ Makefile.am	2009-05-28 15:30:57.000000000 +0200
+@@ -21,20 +21,20 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = . testsuite
+ 
+-LIBOBJS = @LIBOBJS@
++LTLIBOBJS = @LTLIBOBJS@
+ 
+-noinst_LIBRARIES = libargp.a
++lib_LTLIBRARIES = libargp.la
+ noinst_PROGRAMS = argp-test
+ noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
+ 
+ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
+ 
+ # Leaves out argp-fs-xinl.c and argp-xinl.c 
+-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
++libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
+ 		    argp-help.c argp-parse.c argp-pv.c \
+ 		    argp-pvh.c
+ 
+-libargp_a_LIBADD = $(LIBOBJS)
++libargp_la_LIBADD = $(LTLIBOBJS)
+ 
+-argp_test_LDADD = libargp.a
++argp_test_LDADD = libargp.la
+ 
diff --git a/devel/argp-standalone/files/patch-configure.ac b/devel/argp-standalone/files/patch-configure.ac
new file mode 100644
index 000000000000..5abdedba7879
--- /dev/null
+++ b/devel/argp-standalone/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2009-05-28 15:20:01.000000000 +0200
++++ configure.ac	2009-05-28 15:21:06.000000000 +0200
+@@ -17,6 +17,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AM_PROG_CC_STDC
++AC_PROG_LIBTOOL
+ 
+ if test "x$am_cv_prog_cc_stdc" = xno ; then
+   AC_ERROR([the C compiler doesn't handle ANSI-C])
diff --git a/devel/argp-standalone/files/patch-testsuite_Makefile.am b/devel/argp-standalone/files/patch-testsuite_Makefile.am
new file mode 100644
index 000000000000..233db8bf9320
--- /dev/null
+++ b/devel/argp-standalone/files/patch-testsuite_Makefile.am
@@ -0,0 +1,11 @@
+--- testsuite/Makefile.am.orig	2009-05-28 15:21:33.000000000 +0200
++++ testsuite/Makefile.am	2009-05-28 15:21:41.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
+ 
+-LDADD = ../libargp.a
++LDADD = ../.libs/libargp.a
+ 
+ EXTRA_DIST = $(TS_SH) run-tests
+ CLEANFILES = test.out