libtoolize and add builtin.mk. Bump revision.

6 files changed, 158 insertions, 6 deletions

diff --git a/devel/argp/Makefile b/devel/argp/Makefile
index dbfbbc250e4..8067445b326 100644
--- a/devel/argp/Makefile
+++ b/devel/argp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/03/28 13:19:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/22 01:40:20 joerg Exp $
 
 DISTNAME=	argp-standalone-1.3
 PKGNAME=	argp-1.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/misc/
 
@@ -9,12 +10,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/libc/manual/html_node/Argp.html
 COMMENT=	Argument parsing function from glibc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
 INSTALLATION_DIRS=	include lib
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/libargp.a ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/argp.h ${PREFIX}/include/
+	libtool --mode=install ${INSTALL_LIB} ${WRKSRC}/libargp.la ${DESTDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/argp.h ${DESTDIR}${PREFIX}/include/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/argp/PLIST b/devel/argp/PLIST
index 14bfca777a6..3eef1ff4c73 100644
--- a/devel/argp/PLIST
+++ b/devel/argp/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/24 16:57:41 agc Exp $
-lib/libargp.a
+@comment $NetBSD: PLIST,v 1.2 2007/12/22 01:40:21 joerg Exp $
 include/argp.h
+lib/libargp.la
diff --git a/devel/argp/builtin.mk b/devel/argp/builtin.mk
new file mode 100644
index 00000000000..abe67454a26
--- /dev/null
+++ b/devel/argp/builtin.mk
@@ -0,0 +1,46 @@
+# $NetBSD: builtin.mk,v 1.1 2007/12/22 01:40:21 joerg Exp $
+
+BUILTIN_PKG:=	argp
+
+BUILTIN_FIND_FILES_VAR:=	H_ARGP
+BUILTIN_FIND_FILES.H_ARGP=	/usr/include/argp.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
+.if !defined(IS_BUILTIN.argp)
+IS_BUILTIN.argp=	no
+.  if empty(H_ARGP:M__nonexistent__) && empty(H_ARGP:M${LOCALBASE}/*)
+IS_BUILTIN.argp=	yes
+.  endif
+.endif
+MAKEVARS+=	IS_BUILTIN.argp
+
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.argp) && \
+    !empty(IS_BUILTIN.argp:M[yY][eE][sS]) && \
+    empty(H_ARGP:M__nonexistent__)
+
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+.if !defined(USE_BUILTIN.argp)
+.  if ${PREFER.argp} == "pkgsrc"
+USE_BUILTIN.argp=	no
+.  else
+USE_BUILTIN.argp=	${IS_BUILTIN.argp}
+.    if defined(BUILTIN_PKG.argp) && \
+        !empty(IS_BUILTIN.argp:M[yY][eE][sS])
+USE_BUILTIN.argp=	yes
+.    endif
+.  endif  # PREFER.argp
+.endif
+MAKEVARS+=	USE_BUILTIN.argp
+.endif
diff --git a/devel/argp/distinfo b/devel/argp/distinfo
index 49a1ae557d2..9dc6ca3323a 100644
--- a/devel/argp/distinfo
+++ b/devel/argp/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/24 16:57:41 agc Exp $
+$NetBSD: distinfo,v 1.2 2007/12/22 01:40:21 joerg Exp $
 
 SHA1 (argp-standalone-1.3.tar.gz) = 815c560680ebdc11694b88de2f8ec15133e0bfa0
 RMD160 (argp-standalone-1.3.tar.gz) = 1c5cd0b1c382d93774be636a1ea2758d530cfef4
 Size (argp-standalone-1.3.tar.gz) = 130255 bytes
+SHA1 (patch-aa) = 056655a5322beda281f370a02e08a71810b8439d
+SHA1 (patch-ab) = 7ed54ce579b922416aceb0c4e3959307557e8af6
diff --git a/devel/argp/patches/patch-aa b/devel/argp/patches/patch-aa
new file mode 100644
index 00000000000..6722e863531
--- /dev/null
+++ b/devel/argp/patches/patch-aa
@@ -0,0 +1,57 @@
+$NetBSD: patch-aa,v 1.1 2007/12/22 01:40:21 joerg Exp $
+
+--- Makefile.in.orig	2004-02-23 19:22:09.000000000 +0100
++++ Makefile.in
+@@ -88,7 +88,7 @@ libargp_a_OBJECTS = $(am_libargp_a_OBJEC
+ PROGRAMS = $(noinst_PROGRAMS)
+ argp_test_SOURCES = argp-test.c
+ argp_test_OBJECTS = argp-test.$(OBJEXT)
+-argp_test_DEPENDENCIES = libargp.a
++argp_test_DEPENDENCIES = libargp.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -99,10 +99,10 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/argp-help.Po ./$(DEPDIR)/argp-parse.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/argp-pv.Po ./$(DEPDIR)/argp-pvh.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/argp-test.Po
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = libtool --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = libtool --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libargp_a_SOURCES) argp-test.c
+ DIST_SOURCES = $(libargp_a_SOURCES) argp-test.c
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -200,7 +200,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = . testsuite
+-noinst_LIBRARIES = libargp.a
++noinst_LIBRARIES = libargp.la
+ noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
+ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
+ 
+@@ -210,7 +210,7 @@ libargp_a_SOURCES = argp-ba.c argp-eexst
+ 		    argp-pvh.c
+ 
+ libargp_a_LIBADD = $(LIBOBJS)
+-argp_test_LDADD = libargp.a
++argp_test_LDADD = libargp.la
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -269,10 +269,8 @@ distclean-hdr:
+ 
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-libargp.a: $(libargp_a_OBJECTS) $(libargp_a_DEPENDENCIES) 
+-	-rm -f libargp.a
+-	$(libargp_a_AR) libargp.a $(libargp_a_OBJECTS) $(libargp_a_LIBADD)
+-	$(RANLIB) libargp.a
++libargp.la: $(libargp_a_OBJECTS) $(libargp_a_DEPENDENCIES) 
++	libtool --mode=link ${CC} -o $@ -rpath ${libdir} $(LIBOBJS:C/.o$/.lo/) $(libargp_a_OBJECTS:C/.o$/.lo/)
+ 
+ clean-noinstPROGRAMS:
+ 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
diff --git a/devel/argp/patches/patch-ab b/devel/argp/patches/patch-ab
new file mode 100644
index 00000000000..be37b39219e
--- /dev/null
+++ b/devel/argp/patches/patch-ab
@@ -0,0 +1,43 @@
+$NetBSD: patch-ab,v 1.1 2007/12/22 01:40:22 joerg Exp $
+
+--- testsuite/Makefile.in.orig	2007-12-22 02:17:56.000000000 +0100
++++ testsuite/Makefile.in
+@@ -53,24 +53,24 @@ PROGRAMS = $(noinst_PROGRAMS)
+ ex1_SOURCES = ex1.c
+ ex1_OBJECTS = ex1.$(OBJEXT)
+ ex1_LDADD = $(LDADD)
+-ex1_DEPENDENCIES = ../libargp.a
++ex1_DEPENDENCIES = ../libargp.la
+ ex3_SOURCES = ex3.c
+ ex3_OBJECTS = ex3.$(OBJEXT)
+ ex3_LDADD = $(LDADD)
+-ex3_DEPENDENCIES = ../libargp.a
++ex3_DEPENDENCIES = ../libargp.la
+ ex4_SOURCES = ex4.c
+ ex4_OBJECTS = ex4.$(OBJEXT)
+ ex4_LDADD = $(LDADD)
+-ex4_DEPENDENCIES = ../libargp.a
++ex4_DEPENDENCIES = ../libargp.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ex1.Po ./$(DEPDIR)/ex3.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/ex4.Po
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = libtool --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = libtool --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = ex1.c ex3.c ex4.c
+ DIST_SOURCES = ex1.c ex3.c ex4.c
+ ETAGS = etags
+@@ -151,7 +151,7 @@ target_alias = @target_alias@
+ TS_SH = ex1-test permute-test
+ TS_PROGS = 
+ TS_ALL = $(TS_PROGS) $(TS_SH)
+-LDADD = ../libargp.a
++LDADD = ../libargp.la
+ EXTRA_DIST = $(TS_SH) run-tests
+ CLEANFILES = test.out
+ all: all-am