diff options
author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-08-06 16:53:56 +0000 |
---|---|---|
committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-08-06 16:53:56 +0000 |
commit | fb5abdc6f5f09294f994601e0c3aa6ee398a8684 (patch) | |
tree | 54764218acd1e9ac3237bbdcc94b399e257664fd /devel/ice | |
parent | 126a5e1958912ca563924bc40888c4114d2590c1 (diff) | |
download | ports-fb5abdc6f5f09294f994601e0c3aa6ee398a8684.tar.gz ports-fb5abdc6f5f09294f994601e0c3aa6ee398a8684.zip |
Notes
Diffstat (limited to 'devel/ice')
-rw-r--r-- | devel/ice/Makefile | 11 | ||||
-rw-r--r-- | devel/ice/files/Make.rules.FreeBSD | 2 | ||||
-rw-r--r-- | devel/ice/files/patch-Make.rules | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile index f38da321dfd2..1671b4b11530 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= http://www.zeroc.com/download/Ice/3.1/ MAINTAINER= shoesoft@gmx.net COMMENT= A modern alternative to object middleware such as CORBA/COM/DCOM/COM+ -LIB_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42 \ - expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_BDB= 42+ +INVALID_BDB_VER= 2 3 40 41 +USE_LDCONFIG= yes CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} .if defined(DEBUG) @@ -47,6 +48,10 @@ post-patch: s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \ ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/config/Make.rules.FreeBSD + ${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \ + s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g; \ + s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g' \ + ${WRKSRC}/config/Make.rules ${REINPLACE_CMD} 's|prefix|install_slicedir|g' ${WRKSRC}/config/Makefile ${REINPLACE_CMD} 's|prefix|install_slicedir|g; \ s|INSTALL_PROGRAM|INSTALL_DATA|g' ${WRKSRC}/config/ca/Makefile diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD index cee2376ac840..88b32dd96100 100644 --- a/devel/ice/files/Make.rules.FreeBSD +++ b/devel/ice/files/Make.rules.FreeBSD @@ -13,8 +13,6 @@ lp64suffix = prefix = %%PREFIX%% install_slicedir = %%DATADIR%% install_docdir = %%DOCSDIR%% -DB_HOME = $(LOCALBASE) -DB_VERSION = db42 EXPAT_HOME = $(LOCALBASE) INSTALL = %%INSTALL_DATA%% INSTALL_PROGRAM = %%INSTALL_PROGRAM%% diff --git a/devel/ice/files/patch-Make.rules b/devel/ice/files/patch-Make.rules index f95bce0fea07..0605c684dba6 100644 --- a/devel/ice/files/patch-Make.rules +++ b/devel/ice/files/patch-Make.rules @@ -1,5 +1,5 @@ ---- config/Make.rules.orig Sat Jul 15 10:05:05 2006 -+++ config/Make.rules Sat Jul 15 10:05:50 2006 +--- config/Make.rules.orig Sat Aug 5 16:29:46 2006 ++++ config/Make.rules Sat Aug 5 16:29:51 2006 @@ -166,9 +166,9 @@ BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2 BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir))) @@ -7,9 +7,9 @@ -DB_FLAGS = $(if $(DB_HOME),-I$(DB_HOME)/include) -DB_LIBS = $(if $(DB_HOME),-L$(DB_HOME)/$(libsubdir)) -ldb_cxx -DB_RPATH_LINK = $(if $(DB_HOME),$(call rpathlink,$(DB_HOME)/$(libsubdir))) -+DB_FLAGS = $(if $(DB_HOME),-I$(DB_HOME)/include/$(DB_VERSION)) -+DB_LIBS = $(if $(DB_HOME),-L$(DB_HOME)/$(libsubdir)/$(DB_VERSION)) -ldb_cxx -+DB_RPATH_LINK = $(if $(DB_HOME),$(call rpathlink,$(DB_HOME)/$(libsubdir)/$(DB_VERSION))) ++DB_FLAGS = -I%%BDB_INCLUDE_DIR%% ++DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%% ++DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%) EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include) EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat |