diff options
author | Rong-En Fan <rafan@FreeBSD.org> | 2006-07-20 21:07:41 +0000 |
---|---|---|
committer | Rong-En Fan <rafan@FreeBSD.org> | 2006-07-20 21:07:41 +0000 |
commit | 15263f8c0f586d78469568d1275301b209b7cb43 (patch) | |
tree | 23b389a2f0b011a4bcfcb5eedab24e2a0e336896 /devel/ice/files | |
parent | 7807f28f58b1670c4476841df5e2eb1619059274 (diff) | |
download | ports-15263f8c0f586d78469568d1275301b209b7cb43.tar.gz ports-15263f8c0f586d78469568d1275301b209b7cb43.zip |
- Update to 3.1.0
- pet portlint(1)
PR: ports/100583
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=168336
Diffstat (limited to 'devel/ice/files')
-rw-r--r-- | devel/ice/files/Make.rules.FreeBSD | 5 | ||||
-rw-r--r-- | devel/ice/files/patch-Make.rules | 66 | ||||
-rw-r--r-- | devel/ice/files/patch-src::icecpp::config.h | 12 |
3 files changed, 20 insertions, 63 deletions
diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD index 4c61d61235eb..cee2376ac840 100644 --- a/devel/ice/files/Make.rules.FreeBSD +++ b/devel/ice/files/Make.rules.FreeBSD @@ -13,3 +13,8 @@ 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 4b642c902cbd..f95bce0fea07 100644 --- a/devel/ice/files/patch-Make.rules +++ b/devel/ice/files/patch-Make.rules @@ -1,51 +1,15 @@ ---- config/Make.rules.orig Wed May 26 01:09:19 2004 -+++ config/Make.rules Sat May 29 16:02:37 2004 -@@ -12,7 +12,7 @@ - # if it does not exist. - # - --prefix = /opt/Ice-$(VERSION) -+prefix = $(PREFIX)/Ice-$(VERSION) - - # - # Define OPTIMIZE as yes if you want to build with -@@ -91,7 +91,7 @@ - # directory. - # - --#DB_HOME ?= /opt/db -+DB_HOME ?= $(LOCALBASE) - - # - # If OpenSSL is not installed in a standard location where the -@@ -114,7 +114,7 @@ - # installation directory. - # - --#EXPAT_HOME ?= /opt/expat -+EXPAT_HOME ?= $(LOCALBASE) - - - # -@@ -152,8 +152,8 @@ - install_schemadir = $(prefix)/schema - install_docdir = $(prefix)/doc - --INSTALL = cp -fp --INSTALL_PROGRAM = ${INSTALL} -+INSTALL = %%INSTALL_DATA%% -+INSTALL_PROGRAM = %%INSTALL_PROGRAM%% - INSTALL_LIBRARY = ${INSTALL} - INSTALL_DATA = ${INSTALL} - -@@ -203,8 +203,8 @@ - endif - - ifneq ($(DB_HOME),) -- DB_FLAGS = -I$(DB_HOME)/include -- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx -+ DB_FLAGS = -I$(DB_HOME)/include/db42 -+ DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx-4.2 - else - DB_FLAGS = - DB_LIBS = -ldb_cxx +--- config/Make.rules.orig Sat Jul 15 10:05:05 2006 ++++ config/Make.rules Sat Jul 15 10:05:50 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))) + +-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))) + + EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include) + EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat diff --git a/devel/ice/files/patch-src::icecpp::config.h b/devel/ice/files/patch-src::icecpp::config.h deleted file mode 100644 index 32a5bee093a0..000000000000 --- a/devel/ice/files/patch-src::icecpp::config.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/icecpp/config.h.orig Thu Sep 22 18:01:13 2005 -+++ src/icecpp/config.h Thu Nov 17 10:50:07 2005 -@@ -72,7 +72,8 @@ - #if defined(_WIN32) - # define WCHAR_TYPE_SIZE 2 - #elif (defined(__linux) || defined(__FreeBSD__)) && \ -- (defined(__i386) || defined(__x86_64) || defined(__sparc)) || \ -+ (defined(__i386) || defined(__x86_64) || defined(__sparc) || \ -+ defined(__alpha__) || defined(__powerpc__)) || \ - defined (__sun) || defined(__hpux) || defined(__APPLE__) || \ - defined(_AIX) || defined(__osf1__) - # define WCHAR_TYPE_SIZE 4 |