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

add mt flavor capable of co-existing w/default non-mt flavor

Browse Source 
ok kurt@
This commit is contained in:
todd 2007-03-24 13:45:12 +00:00
parent 19a52a354f
commit b2d1109146
7 changed files with 119 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
devel/apr-util/Makefile
View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2006/11/03 10:56:44 alek Exp $
# $OpenBSD: Makefile,v 1.10 2007/03/24 13:45:12 todd Exp $
COMMENT= "companion library to APR"
DISTNAME= apr-util-1.2.7
SHARED_LIBS += aprutil-1 2.7 # .2.7
PKGNAME= ${DISTNAME}p0
FULLPKGNAME= apr-util${MT}-1.2.7p0
SHARED_LIBS += aprutil-1${MT} 2.7 # .2.7
CATEGORIES= devel
@ -11,6 +13,9 @@ MAINTAINER= Aleksander Piotrowski <alek@openbsd.org>
HOMEPAGE= http://apr.apache.org/
FLAVORS= mt
FLAVOR?=
# Apache License 2.0
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -20,8 +25,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_APACHE:=apr/}
LIB_DEPENDS= lib/db4/db.=4:db-4.*:databases/db/v4 \
expat.>=4:expat->=1.95.6:textproc/expat \
apr-1.=2:apr-1.2.7:devel/apr
expat.>=4:expat->=1.95.6:textproc/expat
MODULES= converters/libiconv
USE_LIBTOOL= Yes
@ -30,6 +34,25 @@ CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
--with-dbm=db4 \
--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib/db4 \
--with-expat=${LOCALBASE} \
--with-iconv=${LOCALBASE}
--with-iconv=${LOCALBASE} \
--includedir=${LOCALBASE}/include/apr-1${MT}/ \
--with-apr=${LOCALBASE}/bin/apr-1${MT}-config
MT?=
.if ${FLAVOR:L:Mmt}
MT=-mt
LIB_DEPENDS+= apr-1-mt.=2:apr-mt-1.2.7:devel/apr,mt
post-install:
sed 's/{APRUTIL_LIBNAME}/{APRUTIL_LIBNAME}-mt/g' ${WRKSRC}/apu-config.out > ${PREFIX}/bin/apu-mt
rm ${PREFIX}/bin/apu
.else
LIB_DEPENDS+= apr-1.=2:apr-1.2.7:devel/apr
.endif
SUBST_VARS+= MT
MAKE_ENV+= MT=${MT}
FAKE_ENV+= MT=${MT}
.include <bsd.port.mk>

36
devel/apr-util/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/03/24 13:45:12 todd Exp $
--- Makefile.in.orig Tue May 24 08:09:35 2005
+++ Makefile.in Fri Feb 9 17:18:33 2007
@@ -7,6 +7,8 @@ CPP = @CPP@
APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
+MT?=
+
srcdir = @srcdir@
VPATH = @srcdir@
@@ -14,11 +16,12 @@ INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_
APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
APRUTIL_LIBS = @APRUTIL_LIBS@
-TARGET_LIB = lib@APRUTIL_LIBNAME@.la
+TARGET_LIB = lib@APRUTIL_LIBNAME@${MT}.la
INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
+APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION)${MT}.pc
APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
+APU_INSTCONFIG = apu$(APRUTIL_MAJOR_VERSION}${MT}
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -65,7 +68,7 @@ install: $(TARGET_LIB) apu-config.out
done
$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
- $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
+ $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_INSTCONFIG)
$(TARGET_LIB): $(OBJECTS)
$(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)

17
devel/apr-util/patches/patch-test_Makefile_in
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-test_Makefile_in,v 1.1 2006/09/30 19:08:22 alek Exp $
--- test/Makefile.in.orig Sat Sep 30 21:51:12 2006
+++ test/Makefile.in Sat Sep 30 21:51:14 2006
@@ -19,7 +19,11 @@ all: $(PROGRAMS)
$OpenBSD: patch-test_Makefile_in,v 1.2 2007/03/24 13:45:13 todd Exp $
--- test/Makefile.in.orig Tue Jun 14 06:03:51 2005
+++ test/Makefile.in Fri Feb 9 17:21:57 2007
@@ -8,7 +8,7 @@ TARGETS = $(PROGRAMS)
APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
-TARGET_LIB_PATH = ../lib@APRUTIL_LIBNAME@.la
+TARGET_LIB_PATH = ../lib@APRUTIL_LIBNAME@${MT}.la
CLEAN_TARGETS = manyfile.bin testfile.txt data/sqlite*.db
@@ -21,7 +21,11 @@ all: $(PROGRAMS)
check: $(PROGRAMS)
for prog in $(PROGRAMS); do \

2
devel/apr-util/pkg/PFRAG.mt-shared Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.mt-shared,v 1.1 2007/03/24 13:45:13 todd Exp $
@lib lib/libaprutil-1-mt.so.${LIBaprutil-1-mt_VERSION}

2
devel/apr-util/pkg/PFRAG.no-mt-shared Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.no-mt-shared,v 1.1 2007/03/24 13:45:13 todd Exp $
@lib lib/libaprutil-1.so.${LIBaprutil-1_VERSION}

5
devel/apr-util/pkg/PFRAG.shared
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/01/06 13:14:28 bernd Exp $
@lib lib/libaprutil-1.so.${LIBaprutil-1_VERSION}
@comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/24 13:45:13 todd Exp $
%%mt%%
!%%mt%%

68
devel/apr-util/pkg/PLIST
View File

@ -1,35 +1,37 @@
@comment $OpenBSD: PLIST,v 1.2 2006/10/04 09:30:01 alek Exp $
@comment $OpenBSD: PLIST,v 1.3 2007/03/24 13:45:13 todd Exp $
%%SHARED%%
bin/apu-1-config
include/apr-1/apr_anylock.h
include/apr-1/apr_base64.h
include/apr-1/apr_buckets.h
include/apr-1/apr_date.h
include/apr-1/apr_dbd.h
include/apr-1/apr_dbm.h
include/apr-1/apr_hooks.h
include/apr-1/apr_ldap.h
include/apr-1/apr_ldap_init.h
include/apr-1/apr_ldap_option.h
include/apr-1/apr_ldap_url.h
include/apr-1/apr_md4.h
include/apr-1/apr_md5.h
include/apr-1/apr_optional.h
include/apr-1/apr_optional_hooks.h
include/apr-1/apr_queue.h
include/apr-1/apr_reslist.h
include/apr-1/apr_rmm.h
include/apr-1/apr_sdbm.h
include/apr-1/apr_sha1.h
include/apr-1/apr_strmatch.h
include/apr-1/apr_uri.h
include/apr-1/apr_uuid.h
include/apr-1/apr_xlate.h
include/apr-1/apr_xml.h
include/apr-1/apu.h
include/apr-1/apu_version.h
include/apr-1/apu_want.h
bin/apu${MT}
include/apr-1${MT}/
include/apr-1${MT}/apr_anylock.h
include/apr-1${MT}/apr_base64.h
include/apr-1${MT}/apr_buckets.h
include/apr-1${MT}/apr_date.h
include/apr-1${MT}/apr_dbd.h
include/apr-1${MT}/apr_dbm.h
include/apr-1${MT}/apr_hooks.h
include/apr-1${MT}/apr_ldap.h
include/apr-1${MT}/apr_ldap_init.h
include/apr-1${MT}/apr_ldap_option.h
include/apr-1${MT}/apr_ldap_url.h
include/apr-1${MT}/apr_md4.h
include/apr-1${MT}/apr_md5.h
include/apr-1${MT}/apr_optional.h
include/apr-1${MT}/apr_optional_hooks.h
include/apr-1${MT}/apr_queue.h
include/apr-1${MT}/apr_reslist.h
include/apr-1${MT}/apr_rmm.h
include/apr-1${MT}/apr_sdbm.h
include/apr-1${MT}/apr_sha1.h
include/apr-1${MT}/apr_strmatch.h
include/apr-1${MT}/apr_uri.h
include/apr-1${MT}/apr_uuid.h
include/apr-1${MT}/apr_xlate.h
include/apr-1${MT}/apr_xml.h
include/apr-1${MT}/apu.h
include/apr-1${MT}/apu_version.h
include/apr-1${MT}/apu_want.h
@comment lib/aprutil.exp
lib/libaprutil-1.a
lib/libaprutil-1.la
lib/pkgconfig/apr-util-1.pc
lib/libaprutil-1${MT}.a
lib/libaprutil-1${MT}.la
lib/pkgconfig/
lib/pkgconfig/apr-util-1${MT}.pc