Rev.1: use LIBTOOL and build a shared library

6 files changed, 127 insertions, 5 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 47d5d01a61e..1d6e75b1173 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2005/01/14 11:31:00 adam Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/30 15:23:53 adam Exp $
 
 DISTNAME=	glpk-4.8
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/glpk/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/glpk/glpk.html
 COMMENT=	Library for solving linear programming problems
 
 USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/glpk/PLIST b/math/glpk/PLIST
index d9f9ac1f7bd..01cae72b989 100644
--- a/math/glpk/PLIST
+++ b/math/glpk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/01/14 11:31:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/30 15:23:53 adam Exp $
 bin/glpsol
 bin/tspsol
 include/glpavl.h
@@ -20,4 +20,4 @@ include/glprng.h
 include/glpspx.h
 include/glpstr.h
 include/glptsp.h
-lib/libglpk.a
+lib/libglpk.la
diff --git a/math/glpk/buildlink3.mk b/math/glpk/buildlink3.mk
new file mode 100644
index 00000000000..ab1de08d62b
--- /dev/null
+++ b/math/glpk/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/03/30 15:23:53 adam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GLPK_BUILDLINK3_MK:=	${GLPK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	glpk
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglpk}
+BUILDLINK_PACKAGES+=	glpk
+
+.if !empty(GLPK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.glpk+=	glpk>=4.8nb1
+BUILDLINK_PKGSRCDIR.glpk?=	../../math/glpk
+.endif	# GLPK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index fff9028d1b0..e4dcf362273 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 12:06:55 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/30 15:23:53 adam Exp $
 
 SHA1 (glpk-4.8.tar.gz) = f45f7e0f8b38de7531aa84458877083a4094e0e8
 RMD160 (glpk-4.8.tar.gz) = 505921e0702996fec843e3704c33f07d4bfab869
 Size (glpk-4.8.tar.gz) = 972875 bytes
+SHA1 (patch-aa) = 2a33fe1d803ff7b9cd8943d08c5c37e1582a2532
+SHA1 (patch-ab) = a4b382b3d27dee710fb3127bf141a7c429662ab3
diff --git a/math/glpk/patches/patch-aa b/math/glpk/patches/patch-aa
new file mode 100644
index 00000000000..50ef647e977
--- /dev/null
+++ b/math/glpk/patches/patch-aa
@@ -0,0 +1,56 @@
+$NetBSD: patch-aa,v 1.1 2005/03/30 15:23:53 adam Exp $
+
+--- src/Makefile.in.orig	2005-01-12 09:00:00.000000000 +0000
++++ src/Makefile.in
+@@ -65,7 +65,7 @@ VERSION = @VERSION@
+ 
+ INCLUDES = -I../include
+ 
+-lib_LIBRARIES = libglpk.a
++lib_LIBRARIES = libglpk.la
+ 
+ libglpk_a_SOURCES =  glpavl.c glpdmp.c glpiet.c glpinv.c glpios1.c glpios2.c glpios3.c glpipm.c glplib1a.c glplib1b.c glplib2.c glplib3.c glplpp1.c glplpp2.c glplpx1.c glplpx2.c glplpx3.c glplpx4.c glplpx5.c glplpx6a.c glplpx6b.c glplpx6c.c glplpx6d.c glplpx7.c glplpx8a.c glplpx8b.c glplpx8c.c glplpx8d.c glplpx8e.c glpluf.c glpmat.c glpmip1.c glpmip2.c glpmpl1.c glpmpl2.c glpmpl3.c glpmpl4.c glpqmd.c glprng.c glpspx1.c glpspx2.c glpstr.c glptsp.c
+ 
+@@ -88,9 +88,9 @@ glpmip2.o glpmpl1.o glpmpl2.o glpmpl3.o 
+ glpspx1.o glpspx2.o glpstr.o glptsp.o
+ AR = ar
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = ${LIBTOOL} --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = ${LIBTOOL} --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
+ 
+@@ -137,15 +137,7 @@ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+-	  else :; fi; \
+-	done
+-	@$(POST_INSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
++	    ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $$p $(DESTDIR)$(libdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -171,10 +163,9 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-libglpk.a: $(libglpk_a_OBJECTS) $(libglpk_a_DEPENDENCIES)
+-	-rm -f libglpk.a
+-	$(AR) cru libglpk.a $(libglpk_a_OBJECTS) $(libglpk_a_LIBADD)
+-	$(RANLIB) libglpk.a
++libglpk.la: $(libglpk_a_OBJECTS) $(libglpk_a_DEPENDENCIES)
++	${LIBTOOL} --mode=link ${CC} -o $@ \
++	${libglpk_a_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 4:8
+ 
+ tags: TAGS
+ 
diff --git a/math/glpk/patches/patch-ab b/math/glpk/patches/patch-ab
new file mode 100644
index 00000000000..23578f6936c
--- /dev/null
+++ b/math/glpk/patches/patch-ab
@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.1 2005/03/30 15:23:53 adam Exp $
+
+--- examples/Makefile.in.orig	2005-01-12 09:00:00.000000000 +0000
++++ examples/Makefile.in
+@@ -65,7 +65,7 @@ VERSION = @VERSION@
+ 
+ INCLUDES = -I../include
+ 
+-LDADD = ../src/libglpk.a
++LDADD = ../src/libglpk.la
+ 
+ bin_PROGRAMS = glpsol tspsol
+ 
+@@ -83,16 +83,16 @@ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ glpsol_OBJECTS =  glpsol.o
+ glpsol_LDADD = $(LDADD)
+-glpsol_DEPENDENCIES =  ../src/libglpk.a
++glpsol_DEPENDENCIES =  ../src/libglpk.la
+ glpsol_LDFLAGS = 
+ tspsol_OBJECTS =  tspsol.o
+ tspsol_LDADD = $(LDADD)
+-tspsol_DEPENDENCIES =  ../src/libglpk.a
++tspsol_DEPENDENCIES =  ../src/libglpk.la
+ tspsol_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = ${LIBTOOL} --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = ${LIBTOOL} --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
+ 
+@@ -129,8 +129,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	     ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	  else :; fi; \
+ 	done
+