- Use new SHARED_LIBS framework

- USE_LIBTOOL and bump PKGNAME where appropriate - Fix regression test for fribidi
2005-12-29 13:56:07 +00:00 · 2005-12-29 13:56:07 +00:00 · e278bb371b
commit e278bb371b
parent 6765217b82
17 changed files with 111 additions and 28 deletions
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@ -1,9 +1,20 @@
-# $OpenBSD: Makefile,v 1.38 2005/11/03 18:28:55 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2005/12/29 13:56:07 bernd Exp $

 COMMENT=	"high-performance CORBA ORB with support for the C language"

 DISTNAME=	ORBit-0.5.13
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
+SHARED_LIBS=	IDL		4.4 \
+		IIOP		5.13 \
+		ORBit		5.13 \
+		ORBitCosNaming	5.13 \
+		ORBitutil	5.13
+MODGNU_SHARED_LIBS=	IDL		'' \
+			IIOP		'' \
+			ORBit		'' \
+			ORBitCosNaming	'' \
+			ORBitutil	''
+
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ORBit/0.5/}

@ -25,6 +36,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c m wrap

 USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
 AUTOCONF_VERSION=2.13
 CONFIGURE_STYLE= autoconf
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/popt ${WRKSRC}/libIDL
--- a/devel/ORBit/pkg/PFRAG.shared
+++ b/devel/ORBit/pkg/PFRAG.shared
@ -1,6 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2004/08/10 09:43:46 espie Exp $
-@lib lib/libIDL.so.4.4
-@lib lib/libIIOP.so.5.13
-@lib lib/libORBit.so.5.13
-@lib lib/libORBitCosNaming.so.5.13
-@lib lib/libORBitutil.so.5.13
+@comment $OpenBSD: PFRAG.shared,v 1.9 2005/12/29 13:56:07 bernd Exp $
+@lib lib/libIDL.so.${LIBIDL_VERSION}
+@lib lib/libIIOP.so.${LIBIIOP_VERSION}
+@lib lib/libORBit.so.${LIBORBit_VERSION}
+@lib lib/libORBitCosNaming.so.${LIBORBitCosNaming_VERSION}
+@lib lib/libORBitutil.so.${LIBORBitutil_VERSION}
--- a/devel/ORBit/pkg/PLIST
+++ b/devel/ORBit/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.21 2004/08/10 09:43:46 espie Exp $
+@comment $OpenBSD: PLIST,v 1.22 2005/12/29 13:56:07 bernd Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
@ -88,6 +88,7 @@ lib/liborbit-c-backend.a
 lib/pkgconfig/
 lib/pkgconfig/ORBit.pc
 lib/pkgconfig/libIDL.pc
+share/aclocal/
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
 share/examples/orbit/
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@ -1,12 +1,19 @@
-# $OpenBSD: Makefile,v 1.15 2005/05/24 21:38:07 marcm Exp $
+# $OpenBSD: Makefile,v 1.16 2005/12/29 13:56:07 bernd Exp $

 COMMENT=		"high-performance CORBA Object Request Broker"

 DISTNAME=		ORBit2-2.12.2
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		devel

 HOMEPAGE=		http://www.labs.redhat.com/orbit/

+SHARED_LIBS=		ORBit-2 0.0 ORBit-imodule-2 0.0 ORBitCosNaming-2 0.0
+MODGNU_SHARED_LIBS=	ORBit-2 '' ORBit-imodule-2 '' ORBitCosNaming-2 ''
+LIBORBit-2_ALIAS=		ORBit_2
+LIBORBit-imodule-2_ALIAS=	ORBit_imodule_2
+LIBORBitCosNaming-2_ALIAS=	ORBitCosNaming_2
+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
--- a/devel/ORBit2/pkg/PFRAG.shared
+++ b/devel/ORBit2/pkg/PFRAG.shared
@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/10 09:43:46 espie Exp $
-@lib lib/libORBit-2.so.0.0
-@lib lib/libORBit-imodule-2.so.0.0
-@lib lib/libORBitCosNaming-2.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/29 13:56:08 bernd Exp $
+@lib lib/libORBit-2.so.${LIBORBit-2_VERSION}
+@lib lib/libORBit-imodule-2.so.${LIBORBit-imodule-2_VERSION}
+@lib lib/libORBitCosNaming-2.so.${LIBORBitCosNaming-2_VERSION}
 lib/orbit-2.0/Everything_module.so
--- a/devel/chmlib/Makefile
+++ b/devel/chmlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/11/08 10:40:17 espie Exp $
+# $OpenBSD: Makefile,v 1.2 2005/12/29 13:56:07 bernd Exp $
 COMMENT=	"handling CHM files"
 CATEGORIES=	devel textproc

@ -7,6 +7,9 @@ MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tgz

 DISTNAME=	chmlib-0.37.4
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=		chm 0.0
+MODGNU_SHARED_LIBS=	chm ''
 WRKDIST=	${WRKDIR}/chmlib-0.37

 CONFIGURE_STYLE=gnu
--- a/devel/chmlib/patches/patch-Makefile_in
+++ b/devel/chmlib/patches/patch-Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2005/12/29 13:56:07 bernd Exp $
+--- Makefile.in.orig	Wed Dec 28 15:28:17 2005
+++ Makefile.in	Wed Dec 28 15:28:42 2005
+@@ -31,7 +31,7 @@ src/%.lo: $(srcdir)/src/%.c
+ 	${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
+ 
+ src/libchm.la: src/chm_lib.lo src/lzx.lo
+-	${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir)
+	${LIBTOOL} --mode=link ${CC} -o $@ $^ ${libchm_la_LDFLAGS} ${LDFLAGS} -rpath $(libdir)
+ 
+ install: src/libchm.la
+ 	mkdir -p $(DESTDIR)$(prefix) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
--- a/devel/chmlib/pkg/PFRAG.shared
+++ b/devel/chmlib/pkg/PFRAG.shared
@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/11/08 10:40:17 espie Exp $
-@lib lib/libchm.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/29 13:56:07 bernd Exp $
+@lib lib/libchm.so.${LIBchm_VERSION}
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2004/11/23 11:22:01 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2005/12/29 13:56:07 bernd Exp $
 # $FreeBSD: ports/devel/ffcall/Makefile,v 1.2 2001/08/31 14:20:18 sobomax Exp $
 # Original From:                jagapen@home.com

@ -9,6 +9,11 @@ BROKEN=		"mmap configure test causes system hang"
 COMMENT=	"foreign function call libraries"

 DISTNAME=	ffcall-1.9
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=		avcall		0.0 \
+			callback	0.0
+MODGNU_SHARED_LIBS=	avcall		'' \
+			callback	''
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ilog.fr/pub/Users/haible/gnu/
 HOMEPAGE=	http://www.haible.de/bruno/packages-ffcall.html
--- a/devel/ffcall/patches/patch-avcall_Makefile_in
+++ b/devel/ffcall/patches/patch-avcall_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-avcall_Makefile_in,v 1.3 2005/12/29 13:56:07 bernd Exp $
+--- avcall/Makefile.in.orig	Wed Dec 28 15:49:22 2005
+++ avcall/Makefile.in	Wed Dec 28 15:49:38 2005
+@@ -144,7 +144,7 @@ structcpy.lo : $(srcdir)/structcpy.c
+ 	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c $(srcdir)/structcpy.c
+ 
+ libavcall.la : $(OBJECTS)
+-	$(LIBTOOL_LINK) $(CC) -o libavcall.la -rpath $(libdir) $(OBJECTS)
+	$(LIBTOOL_LINK) $(CC) -o libavcall.la $(libavcall_la_LDFLAGS) -rpath $(libdir) $(OBJECTS)
+ 
+ # Installs the library and include files only. Typically called with only
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
--- a/devel/ffcall/patches/patch-callback_Makefile_in
+++ b/devel/ffcall/patches/patch-callback_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-callback_Makefile_in,v 1.3 2005/12/29 13:56:07 bernd Exp $
+--- callback/Makefile.in.orig	Wed Dec 28 15:47:54 2005
+++ callback/Makefile.in	Wed Dec 28 15:48:42 2005
+@@ -61,7 +61,7 @@ trampoline_r.h :
+ 	$(LN_S) trampoline_r/trampoline_r.h trampoline_r.h
+ 
+ libcallback.la : vacall_r/libvacall.la trampoline_r/libtrampoline.la
+-	$(LIBTOOL_LINK) $(CC) -o libcallback.la -rpath $(libdir) vacall_r/vacall.lo vacall_r/misc.lo vacall_r/structcpy.lo trampoline_r/*.lo
+	$(LIBTOOL_LINK) $(CC) -o libcallback.la $(libcallback_la_LDFLAGS) -rpath $(libdir) vacall_r/vacall.lo vacall_r/misc.lo vacall_r/structcpy.lo trampoline_r/*.lo
+ 
+ # Installs the library and include files only. Typically called with only
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
--- a/devel/ffcall/pkg/PFRAG.shared
+++ b/devel/ffcall/pkg/PFRAG.shared
@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/08 17:55:29 espie Exp $
-@lib lib/libavcall.so.0.0
-@lib lib/libcallback.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/29 13:56:07 bernd Exp $
+@lib lib/libavcall.so.${LIBavcall_VERSION}
+@lib lib/libcallback.so.${LIBcallback_VERSION}
--- a/devel/fox/Makefile
+++ b/devel/fox/Makefile
@ -1,10 +1,16 @@
-# $OpenBSD: Makefile,v 1.5 2005/08/10 13:16:32 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2005/12/29 13:56:07 bernd Exp $

 COMMENT='C++ toolkit for GUI'
 CATEGORIES=devel

 DISTNAME=fox-1.4.17
 PKGNAME=${DISTNAME}
+SHARED_LIBS=		CHART-1.4	0.17 \
+			FOX-1.4		0.17
+MODGNU_SHARED_LIBS=	CHART-1.4	'-export-dynamic' \
+			FOX-1.4		'-export-dynamic'
+LIBCHART-1.4_ALIAS=	CHART_1_4
+LIBFOX-1.4_ALIAS=	FOX_1_4
 MASTER_SITES=${HOMEPAGE}/ftp/
 HOMEPAGE=http://www.fox-toolkit.org/
 MAINTAINER=Marc Espie <espie@openbsd.org>
--- a/devel/fox/pkg/PFRAG.shared
+++ b/devel/fox/pkg/PFRAG.shared
@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2005/08/10 13:16:32 espie Exp $
-@lib lib/libCHART-1.4.so.0.17
-@lib lib/libFOX-1.4.so.0.17
+@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/29 13:56:07 bernd Exp $
+@lib lib/libCHART-1.4.so.${LIBCHART-1.4_VERSION}
+@lib lib/libFOX-1.4.so.${LIBFOX-1.4_VERSION}
--- a/devel/fribidi/Makefile
+++ b/devel/fribidi/Makefile
@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2005/07/10 15:08:05 couderc Exp $
+# $OpenBSD: Makefile,v 1.5 2005/12/29 13:56:08 bernd Exp $

 COMMENT=		"library implementing the Unicode Bidirectional Algorithm"

 DISTNAME=		fribidi-0.10.4
+PKGNAME=		${DISTNAME}p0
+SHARED_LIBS=		fribidi 0.0
+MODGNU_SHARED_LIBS=	fribidi ''
 CATEGORIES=		devel

 HOMEPAGE=		http://fribidi.sourceforge.net/
@ -17,6 +20,7 @@ WANTLIB=		c
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fribidi/}
 EXTRACT_SUFX=		.tar.bz2

+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}

--- a/devel/fribidi/patches/patch-run_tests
+++ b/devel/fribidi/patches/patch-run_tests
@ -0,0 +1,9 @@
+$OpenBSD: patch-run_tests,v 1.1 2005/12/29 13:56:08 bernd Exp $
+--- run.tests.orig	Wed Dec 28 18:24:05 2005
+++ run.tests	Wed Dec 28 18:24:47 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
+#!/bin/sh
+ # run.tests - Check that the algorithm does what it is supposed to
+ # Copyright (C) 1999,2000 Dov Grobgeld, and
+ # Copyright (C) 2001,2002 Behdad Esfahbod.
--- a/devel/fribidi/pkg/PFRAG.shared
+++ b/devel/fribidi/pkg/PFRAG.shared
@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/08 17:55:29 espie Exp $
-@lib lib/libfribidi.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/29 13:56:08 bernd Exp $
+@lib lib/libfribidi.so.${LIBfribidi_VERSION}