cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the optshared target for dependant ports.

Browse Source
This commit is contained in:
ajacoutot 2014-04-27 09:45:05 +00:00
parent 4d0f633d78
commit 8e8781a7eb
8 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/ptlib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2014/04/25 11:17:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2014/04/27 09:45:05 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,6 +8,7 @@ V= 2.12.9
DISTNAME= ptlib-${V}
EXTRACT_SUFX= .tar.bz2
SUBST_VARS= V
REVISION= 0
SHARED_LIBS= pt 7.0

26
devel/ptlib/patches/patch-make_toplevel_mak
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-make_toplevel_mak,v 1.1 2014/04/25 11:17:27 ajacoutot Exp $
We only use versioned libraries (.so.X.Y versus .so).
(PTLIB_FILE = PTLIB_SONAME)
--- make/toplevel.mak.orig Mon Feb 17 03:14:37 2014
+++ make/toplevel.mak Sat Apr 19 20:07:46 2014
@@ -166,18 +166,6 @@ install:
$(INSTALL) -m 755 $$lib $(DESTDIR)$(libdir); \
fi ) \
done )
- ( if test -e $(PTLIB_LIBDIR)/$(PTLIB_SONAME); then \
- (cd $(DESTDIR)$(libdir) ; \
- rm -f $(PTLIB_FILE) ; \
- ln -sf $(PTLIB_SONAME) $(PTLIB_FILE) \
- ) \
- fi )
- ( if test -e $(PTLIB_LIBDIR)/$(PTLIB_DEBUG_SONAME); then \
- (cd $(DESTDIR)$(libdir) ; \
- rm -f $(PTLIB_DEBUG_FILE) ; \
- ln -sf $(PTLIB_DEBUG_SONAME) $(PTLIB_DEBUG_FILE) \
- ) \
- fi )
ifeq (1, $(HAS_PLUGINS))
if test -e $(PTLIB_LIBDIR)/device/; then \
cd $(PTLIB_LIBDIR)/device/; \

11
devel/ptlib/patches/patch-make_unix_mak
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-make_unix_mak,v 1.5 2014/04/25 11:17:27 ajacoutot Exp $
$OpenBSD: patch-make_unix_mak,v 1.6 2014/04/27 09:45:05 ajacoutot Exp $
Make sure _SONAME is versioned (.so.X.Y versus .so).
(overriding PTLIB_FILE will drop the _s.a static lib but we don't use it)
--- make/unix.mak.orig Mon Feb 17 03:14:37 2014
+++ make/unix.mak Mon Apr 21 21:49:55 2014
@ -30,10 +29,10 @@ Make sure _SONAME is versioned (.so.X.Y versus .so).
endif
+ifeq ($(target_os),OpenBSD)
+ PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX).${LIBpt_VERSION}
+ PTLIB_DEBUG_FILE= lib$(PTLIB_BASE)_d$(LIB_TYPE).$(LIB_SUFFIX).${LIBpt_VERSION}
+ PTLIB_SONAME = $(PTLIB_FILE)
+ PTLIB_DEBUG_SONAME = $(PTLIB_DEBUG_FILE)
+ PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+ PTLIB_DEBUG_FILE= lib$(PTLIB_BASE)_d$(LIB_TYPE).$(LIB_SUFFIX)
+ PTLIB_SONAME = $(PTLIB_FILE).${LIBpt_VERSION}
+ PTLIB_DEBUG_SONAME = $(PTLIB_DEBUG_FILE).${LIBpt_VERSION}
+endif
###############################################################################

4
devel/ptlib/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2014/04/25 11:17:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2014/04/27 09:45:05 ajacoutot Exp $
@conflict pwlib-*
@pkgpath devel/pwlib
@pkgpath devel/pwlib,ldap
@ -178,7 +178,9 @@ include/ptlib/video.h
include/ptlib/videoio.h
include/ptlib/videoio1394dc.h
include/ptlib/wxstring.h
lib/libpt.so
@lib lib/libpt.so.${LIBpt_VERSION}
lib/libpt_s.a
lib/pkgconfig/ptlib.pc
lib/ptlib-${V}/
lib/ptlib-${V}/devices/

3
net/h323plus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2014/04/25 14:13:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2014/04/27 09:46:26 ajacoutot Exp $
# XXX drop at next release
CONFIGURE_ARGS += --enable-h235
@ -11,6 +11,7 @@ V= 1_26_0
DISTNAME= h323plus-v${V}
PKGNAME= h323plus-${V:S/_/./g}
WRKDIST= ${WRKDIR}/h323plus
REVISION= 0
CATEGORIES= net devel

14
net/h323plus/patches/patch-Makefile_in
View File

@ -1,15 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.6 2014/04/25 11:17:59 ajacoutot Exp $
$OpenBSD: patch-Makefile_in,v 1.7 2014/04/27 09:46:26 ajacoutot Exp $
We only use versioned libraries (.so.X.Y versus .so).
--- Makefile.in.orig Thu Dec 12 17:16:27 2013
+++ Makefile.in Sun Apr 20 10:41:12 2014
@@ -99,23 +99,7 @@ docs:
+++ Makefile.in Sun Apr 27 11:21:31 2014
@@ -99,22 +99,9 @@ docs:
install:
mkdir -p $(DESTDIR)$(LIBDIR)
rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
- $(INSTALL) -m 444 lib/$(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
- (cd $(DESTDIR)$(LIBDIR) ; \
+ $(INSTALL) -m 444 lib/$(OH323_FILE).${LIBh323_VERSION} $(DESTDIR)$(LIBDIR)
(cd $(DESTDIR)$(LIBDIR) ; \
- rm -f $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \
- ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ \
- )
@ -24,8 +25,7 @@ We only use versioned libraries (.so.X.Y versus .so).
- (cd $(DESTDIR)$(LIBDIR); \
- rm -f libopenh323.$(SHAREDLIBEXT) ; \
- ln -sf $(OH323_FILE) libopenh323.$(SHAREDLIBEXT) \
- )
+ $(INSTALL) -m 444 lib/$(OH323_FILE).${LIBh323_VERSION} $(DESTDIR)$(LIBDIR)
+ ln -sf $(OH323_FILE).${LIBh323_VERSION} $(OH323_FILE) \
)
( for dir in $(DESTDIR)$(LIBDIR) \
$(DESTDIR)$(PREFIX)/include/openh323 \
$(DESTDIR)$(PREFIX)/include/openh323/codec \

3
net/h323plus/patches/patch-src_make_lib_mak
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-src_make_lib_mak,v 1.1 2014/04/25 11:17:59 ajacoutot Exp $
$OpenBSD: patch-src_make_lib_mak,v 1.2 2014/04/27 09:46:26 ajacoutot Exp $
Make sure LIB_SONAME is versioned (.so.X.Y versus .so).
(LIBNAME_PAT = LIB_SONAME)
soname usage is discouraged on OpenBSD.

3
net/h323plus/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2014/04/25 11:17:59 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2014/04/27 09:46:26 ajacoutot Exp $
@conflict openh323-*
@pkgpath net/openh323
include/openh323/
@ -120,6 +120,7 @@ include/openh323/t38proto.h
include/openh323/transports.h
include/openh323/x224.h
include/openh323/x880.h
lib/libh323.so
@lib lib/libh323.so.${LIBh323_VERSION}
share/openh323/
share/openh323/openh323u.mak