ports/101409: convert devel/ice to USE_BDB

[Stefan Ehmann]

>Number:         101409
>Category:       ports
>Synopsis:       convert devel/ice to USE_BDB
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 05 15:40:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Ehmann
>Release:        FreeBSD 6.1-RELEASE-p1 i386
>Organization:
>Environment:


System: FreeBSD 6.1-RELEASE-p1 #16: Tue Jun  6 16:51:49 CEST 2006
    stefan at taxman.pepperland:/usr/obj/usr/src/sys/TAXMAN



>Description:


convert to USE_BDB
as suggested by rafan


>How-To-Repeat:





>Fix:


--- ice-bdb-diff begins here ---
diff -ruN ice.bak/Makefile ice/Makefile
--- ice.bak/Makefile	Sat Aug  5 16:05:53 2006
+++ ice/Makefile	Sat Aug  5 17:00:52 2006
@@ -13,10 +13,11 @@
 MAINTAINER=	shoesoft at 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
+USE_BDB=	yes
+INVALID_BDB_VER=	2 3 40 41
 INSTALLS_SHLIB=	yes
 
 CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS}
@@ -47,6 +48,10 @@
 		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 -ruN ice.bak/files/Make.rules.FreeBSD ice/files/Make.rules.FreeBSD
--- ice.bak/files/Make.rules.FreeBSD	Sat Aug  5 16:05:53 2006
+++ ice/files/Make.rules.FreeBSD	Sat Aug  5 16:45:14 2006
@@ -13,8 +13,6 @@
 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 -ruN ice.bak/files/patch-Make.rules ice/files/patch-Make.rules
--- ice.bak/files/patch-Make.rules	Sat Aug  5 16:05:53 2006
+++ ice/files/patch-Make.rules	Sat Aug  5 16:41:59 2006
@@ -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
--- ice-bdb-diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: