Index: head/devel/argp-standalone/Makefile
===================================================================
--- head/devel/argp-standalone/Makefile	(revision 421833)
+++ head/devel/argp-standalone/Makefile	(revision 421834)
@@ -1,27 +1,30 @@
 # Created by: Sergey Matveychuk <sem@ciam.ru>
 # $FreeBSD$
 
 PORTNAME=	argp-standalone
 PORTVERSION=	1.3
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/misc/ \
 		LOCAL/sem
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standalone version of arguments parsing functions from GLIBC
 
+LICENSE=	LGPL20+ PD
+LICENSE_COMB=	multi
+
 USES=		autoreconf libtool
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 PLIST_FILES=	lib/libargp.a \
 		lib/libargp.so lib/libargp.so.0 lib/libargp.so.0.0.0 \
 		include/argp.h
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/argp.h ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>
Index: head/devel/argp-standalone/files/patch-Makefile.am
===================================================================
--- head/devel/argp-standalone/files/patch-Makefile.am	(revision 421833)
+++ head/devel/argp-standalone/files/patch-Makefile.am	(revision 421834)
@@ -1,28 +1,28 @@
---- Makefile.am.orig	2009-05-28 15:19:50.000000000 +0200
-+++ Makefile.am	2009-05-28 15:30:57.000000000 +0200
+--- Makefile.am.orig	2004-02-23 17:57:28 UTC
++++ Makefile.am
 @@ -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
  
Index: head/devel/argp-standalone/files/patch-configure.ac
===================================================================
--- head/devel/argp-standalone/files/patch-configure.ac	(revision 421833)
+++ head/devel/argp-standalone/files/patch-configure.ac	(revision 421834)
@@ -1,10 +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 @@
+--- configure.ac.orig	2004-02-23 17:57:29 UTC
++++ configure.ac
+@@ -17,6 +17,7 @@ AC_PROG_CC
  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])
Index: head/devel/argp-standalone/files/patch-testsuite_Makefile.am
===================================================================
--- head/devel/argp-standalone/files/patch-testsuite_Makefile.am	(revision 421833)
+++ head/devel/argp-standalone/files/patch-testsuite_Makefile.am	(revision 421834)
@@ -1,11 +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 @@
+--- testsuite/Makefile.am.orig	2003-02-04 19:38:52 UTC
++++ testsuite/Makefile.am
+@@ -5,7 +5,7 @@ TS_ALL = $(TS_PROGS) $(TS_SH)
  
  noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
  
 -LDADD = ../libargp.a
 +LDADD = ../.libs/libargp.a
  
  EXTRA_DIST = $(TS_SH) run-tests
  CLEANFILES = test.out