SHARED_LIBS

2005-12-31 17:29:37 +00:00 · 2005-12-31 17:29:37 +00:00 · e6b6088d27
commit e6b6088d27
parent 334a741989
11 changed files with 127 additions and 40 deletions
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2005/07/14 12:45:35 aanriot Exp $
+# $OpenBSD: Makefile,v 1.23 2005/12/31 17:29:37 naddy Exp $

 COMMENT=	"3D Athena Widget set that looks like Motif"

 DISTNAME=	Xaw3d-1.5
 PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=	Xaw3d 11.0
 CATEGORIES=	x11

 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
@ -18,6 +19,8 @@ WANTLIB=		ICE SM X11 Xext Xmu Xp Xpm Xt
 USE_X11=	Yes

 CONFIGURE_STYLE=imake
+MAKE_FLAGS=	SOXAWREV=${LIBXaw3d_VERSION}
+FAKE_FLAGS=	${DESTDIRNAME}=${WRKINST} ${MAKE_FLAGS}

 WRKDIST=	${WRKDIR}/xc/lib/Xaw3d

--- a/x11/Xaw3d/patches/patch-Imakefile
+++ b/x11/Xaw3d/patches/patch-Imakefile
@ -1,19 +1,7 @@
-$OpenBSD: patch-Imakefile,v 1.1 2002/12/05 06:08:54 pvalchev Exp $
--- Imakefile.orig	Tue Oct 15 08:41:19 1996
-+++ Imakefile	Wed Dec  4 18:16:34 2002
-@@ -6,7 +6,11 @@ XCOMM $XConsortium: Imakefile,v 1.78 91/
- #define DoProfileLib ProfileLibXaw 
- #define HasSharedData YES
- #define LibName Xaw3d
-+#if XFree86Version < 4000
- #define SoRev SOXAWREV
-+#else
-+#define SoRev SOXAW6REV
-+#endif
- #define IncSubdir X11
- #define IncSubSubdir Xaw3d
- 
-@@ -39,9 +43,9 @@ DEFINES = XawI18nDefines
+$OpenBSD: patch-Imakefile,v 1.2 2005/12/31 17:29:38 naddy Exp $
+--- Imakefile.orig	Tue Oct 15 16:41:19 1996
+++ Imakefile	Sat Dec 31 16:32:15 2005
+@@ -39,9 +39,9 @@ DEFINES = XawI18nDefines
 
        LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
 
--- a/x11/Xaw3d/pkg/PFRAG.shared
+++ b/x11/Xaw3d/pkg/PFRAG.shared
@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2005/07/14 12:45:35 aanriot Exp $
-@lib lib/libXaw3d.so.11.0
+@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/31 17:29:38 naddy Exp $
+@lib lib/libXaw3d.so.${LIBXaw3d_VERSION}
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2005/08/17 16:10:05 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2005/12/31 17:29:38 naddy Exp $

 COMMENT=		'drag and drop library'

 DISTNAME=		dnd.1.1
 PKGNAME=		libdnd-1.1p0
+SHARED_LIBS=		Dnd++	0.0 \
+			Dnd	0.0
 CATEGORIES=		x11 devel

 MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>
@ -18,6 +20,9 @@ EXTRACT_SUFX=		.tgz

 USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
+MAKE_FLAGS=		LIBDnd_VERSION=${LIBDnd_VERSION} \
+			LIBDnd++_VERSION=${LIBDnd++_VERSION}
+FAKE_FLAGS=		${DESTDIRNAME}=${WRKINST} ${MAKE_FLAGS}

 WRKDIST=		${WRKDIR}/DND
 WRKSRC=			${WRKDIST}/DNDlib
--- a/x11/libdnd/patches/patch-DNDlib_Makefile_in
+++ b/x11/libdnd/patches/patch-DNDlib_Makefile_in
@ -1,20 +1,19 @@
-$OpenBSD: patch-DNDlib_Makefile_in,v 1.1.1.1 2001/03/07 15:43:33 wilfried Exp $
+$OpenBSD: patch-DNDlib_Makefile_in,v 1.2 2005/12/31 17:29:38 naddy Exp $
 --- DNDlib/Makefile.in.orig	Fri May 23 04:18:22 1997
-+++ DNDlib/Makefile.in	Fri Feb  9 21:04:27 2001
+++ DNDlib/Makefile.in	Sat Dec 31 17:36:23 2005
@@ -13,30 +13,41 @@ LDFLAGS = @LDFLAGS@
 RANLIB = @RANLIB@
 
 LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@
-
+LIBS+=		-Wl,-rpath,$(X11BASE)/lib
+SHLDFLAGS=	-shared -fPIC
+DNDLIB=		libDnd.so.${LIBDnd_VERSION}
+DNDPLUSLIB=	libDnd++.so.${LIBDnd++_VERSION}
+ 
 -prefix = @prefix@
 -exec_prefix = @exec_prefix@
 -LIB_DIR = @libdir@
 -INC_DIR = @includedir@/OffiX
-+LIBS+=		-Wl,-rpath,$(X11BASE)/lib
-+SHLDFLAGS=	-shared -fPIC
-+DNDLIB=		libDnd.so.0.0
-+DNDPLUSLIB=	libDnd++.so.0.0
-+
 +#prefix = @prefix@
 +#exec_prefix = @exec_prefix@
 +#LIB_DIR = @libdir@
@ -63,12 +62,12 @@ $OpenBSD: patch-DNDlib_Makefile_in,v 1.1.1.1 2001/03/07 15:43:33 wilfried Exp $
 +	rm -f DragAndDrop.so 
 +	$(SOCOMPILE) -o DragAndDrop.so DragAndDrop.c
 +	$(CC) $(SHLDFLAGS) -o $(DNDLIB) DragAndDrop.so
-+
+ 
 +$(DNDPLUSLIB): DragAndDrop.c
 +	rm -f DragAndDrop.so DragAndDrop.cxx
 +	ln -s DragAndDrop.c DragAndDrop.cxx
 +	$(SOCXXCOMPILE) -o DragAndDrop.so DragAndDrop.cxx
 +	$(CC) $(SHLDFLAGS) -o $(DNDPLUSLIB) DragAndDrop.so
- 
+
 +clean:
 +	rm -f *.o *.so *.cxx *.a dndtest *~ *bak
--- a/x11/libdnd/pkg/PFRAG.shared
+++ b/x11/libdnd/pkg/PFRAG.shared
@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 19:26:30 espie Exp $
-@lib lib/libDnd++.so.0.0
-@lib lib/libDnd.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/31 17:29:38 naddy Exp $
+@lib lib/libDnd++.so.${LIBDnd++_VERSION}
+@lib lib/libDnd.so.${LIBDnd_VERSION}
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.29 2005/02/07 19:01:50 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.30 2005/12/31 17:29:38 naddy Exp $

 COMMENT=	"GUI toolkit for X11"

 DISTNAME=	xforms-1.0
+SHARED_LIBS=	flimage	1.0 \
+		forms	1.0 \
+		formsGL	1.0
 CATEGORIES=	x11

 HOMEPAGE=	http://world.std.com/~xforms/
@ -18,6 +21,10 @@ WANTLIB=		GL X11 Xext Xpm c jpeg m

 USE_X11=		Yes
 CONFIGURE_STYLE=	imake
+MAKE_FLAGS=		LIBflimage_VERSION=${LIBflimage_VERSION} \
+			LIBforms_VERSION=${LIBforms_VERSION} \
+			LIBformsGL_VERSION=${LIBformsGL_VERSION}
+FAKE_FLAGS=		${DESTNAMEDIR}=${WRKINST} ${MAKE_FLAGS}

 BUILD_DEPENDS=		::graphics/jpeg

@ -25,4 +32,8 @@ LIB_DEPENDS=		tiff.35::graphics/tiff

 NO_REGRESS=		Yes

+# crud confuses update-plist
+post-extract:
+	@find ${WRKDIST} -name \*.orig -print0 | xargs -0 rm
+
 .include <bsd.port.mk>
--- a/x11/xforms/patches/patch-gl_Imakefile
+++ b/x11/xforms/patches/patch-gl_Imakefile
@ -0,0 +1,27 @@
+$OpenBSD: patch-gl_Imakefile,v 1.1 2005/12/31 17:29:38 naddy Exp $
+--- gl/Imakefile.orig	Sat Dec 31 18:19:37 2005
+++ gl/Imakefile	Sat Dec 31 18:20:18 2005
+@@ -71,7 +71,7 @@ CCOPTIONS	=
+     STD_DEFINES = LibraryDefines
+     CDEBUGFLAGS = LibraryCDebugFlags
+ #else
+-#define SoRev XFORMSLIBREV
+#define SoRev LIBformsGL_VERSION
+ #define IncSubdir X11
+ #include <Library.tmpl>
+ #endif
+@@ -102,11 +102,11 @@ LibraryObjectRule()
+ 
+ #if DoSharedLib
+ # if DoNormalLib
+-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),shared,..)
+SharedLibraryTarget($(LIBNAME),$(LIBformsGL_VERSION),$(OBJS),shared,..)
+ # else
+-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),.,.)
+SharedLibraryTarget($(LIBNAME),$(LIBformsGL_VERSION),$(OBJS),.,.)
+ #endif
+-InstallSharedLibrary($(LIBNAME),$(XFORMSLIBREV),$(XFORMSLIBDIR))
+InstallSharedLibrary($(LIBNAME),$(LIBformsGL_VERSION),$(XFORMSLIBDIR))
+ #endif
+ #if DoNormalLib
+ NormalLibraryTarget($(LIBNAME),$(OBJS))
--- a/x11/xforms/patches/patch-image_Imakefile
+++ b/x11/xforms/patches/patch-image_Imakefile
@ -0,0 +1,27 @@
+$OpenBSD: patch-image_Imakefile,v 1.1 2005/12/31 17:29:38 naddy Exp $
+--- image/Imakefile.orig	Sat Dec 31 18:18:24 2005
+++ image/Imakefile	Sat Dec 31 18:19:22 2005
+@@ -101,7 +101,7 @@ CCOPTIONS	= -nostdinc
+     STD_DEFINES = LibraryDefines
+     CDEBUGFLAGS = LibraryCDebugFlags
+ #else
+-#define SoRev XFORMSLIBREV
+#define SoRev LIBflimage_VERSION
+ #define IncSubdir X11
+ #include <Library.tmpl>
+ #endif
+@@ -153,11 +153,11 @@ LibraryObjectRule()
+ 
+ #if DoSharedLib
+ #if DoNormalLib
+-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),shared,..)
+SharedLibraryTarget($(LIBNAME),$(LIBflimage_VERSION),$(OBJS),shared,..)
+ #else
+-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),.,.)
+SharedLibraryTarget($(LIBNAME),$(LIBflimage_VERSION),$(OBJS),.,.)
+ #endif
+-InstallSharedLibrary($(LIBNAME),$(XFORMSLIBREV),$(XFORMSLIBDIR))
+InstallSharedLibrary($(LIBNAME),$(LIBflimage_VERSION),$(XFORMSLIBDIR))
+ #endif
+ #if DoNormalLib
+ NormalLibraryTarget($(LIBNAME),$(OBJS))
--- a/x11/xforms/patches/patch-lib_Imakefile
+++ b/x11/xforms/patches/patch-lib_Imakefile
@ -0,0 +1,27 @@
+$OpenBSD: patch-lib_Imakefile,v 1.1 2005/12/31 17:29:38 naddy Exp $
+--- lib/Imakefile.orig	Sat Dec 31 17:55:11 2005
+++ lib/Imakefile	Sat Dec 31 17:58:16 2005
+@@ -150,7 +150,7 @@ CCOPTIONS	=
+     STD_DEFINES = LibraryDefines
+     CDEBUGFLAGS = LibraryCDebugFlags
+ #else
+-#define SoRev XFORMSLIBREV
+#define SoRev LIBforms_VERSION
+ #define IncSubdir X11
+ #include <Library.tmpl>
+ #endif
+@@ -199,11 +199,11 @@ LibraryObjectRule()
+ 
+ #if DoSharedLib
+ # if DoNormalLib
+-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),shared,..)
+SharedLibraryTarget($(LIBNAME),$(LIBforms_VERSION),$(OBJS),shared,..)
+ # else
+-SharedLibraryTarget($(LIBNAME),$(XFORMSLIBREV),$(OBJS),.,.)
+SharedLibraryTarget($(LIBNAME),$(LIBforms_VERSION),$(OBJS),.,.)
+ #endif
+-InstallSharedLibrary($(LIBNAME),$(XFORMSLIBREV),$(XFORMSLIBDIR))
+InstallSharedLibrary($(LIBNAME),$(LIBforms_VERSION),$(XFORMSLIBDIR))
+ #endif
+ #if DoNormalLib
+ NormalLibraryTarget($(LIBNAME),$(OBJS))
--- a/x11/xforms/pkg/PFRAG.shared
+++ b/x11/xforms/pkg/PFRAG.shared
@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2004/09/15 19:26:34 espie Exp $
-@lib lib/libflimage.so.1.0
-@lib lib/libforms.so.1.0
-@lib lib/libformsGL.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/31 17:29:38 naddy Exp $
+@lib lib/libflimage.so.${LIBflimage_VERSION}
+@lib lib/libforms.so.${LIBforms_VERSION}
+@lib lib/libformsGL.so.${LIBformsGL_VERSION}