- Update to 3.3.1

PR:		ports/134556
Submitted by:	Dirk Ye <dirk.ye AT gmail.com> (maintainer)
This commit is contained in:
Li-Wen Hsu 2009-05-23 15:21:03 +00:00
parent 05a4bddbb2
commit 076d5bd311
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=234455
5 changed files with 125 additions and 37 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= Ice
PORTVERSION= 3.3.0
PORTVERSION= 3.3.1
CATEGORIES= devel python
MASTER_SITES= http://www.zeroc.com/download/Ice/3.3/ \
http://www.dirk.sh/dirk/Ice/
@ -24,7 +24,7 @@ USE_PYTHON= yes
BUILD_WRKSRC= ${WRKSRC}/py
INSTALL_WRKSRC= ${WRKSRC}/py
LIB_VRS= ${PORTVERSION:S|.||g:C|0$||}
LIB_VRS= ${PORTVERSION:S|.||g:C|1$||}
PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS}

View File

@ -1,3 +1,3 @@
MD5 (Ice-3.3.0.tar.gz) = 0500306d9cdbc0fbb553fbb529de557a
SHA256 (Ice-3.3.0.tar.gz) = 73330e29799d08605d51b9fc148fdc11eb01b6c55b7e4bf4dcb8fafd98ba7749
SIZE (Ice-3.3.0.tar.gz) = 4260675
MD5 (Ice-3.3.1.tar.gz) = 1f37dfcec4662fcde030553fb447d064
SHA256 (Ice-3.3.1.tar.gz) = 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0
SIZE (Ice-3.3.1.tar.gz) = 4455154

View File

@ -1,13 +1,13 @@
--- config/Make.common.rules.orig 2008-05-17 01:24:00.000000000 +0800
+++ config/Make.common.rules 2008-08-14 17:48:05.000000000 +0800
@@ -307,24 +307,24 @@
$(call mkdir,$(prefix)) ; \
--- config/Make.common.rules.orig 2009-04-13 22:41:24.000000000 +0800
+++ config/Make.common.rules 2009-04-13 22:43:01.000000000 +0800
@@ -309,24 +309,24 @@
$(call mkdir,$(prefix), -p) ; \
fi
- @if test ! -d $(install_slicedir) ; \
- then \
- echo "Creating $(install_slicedir)..." ; \
- $(call mkdir,$(install_slicedir)) ; \
- $(call mkdir, $(install_slicedir)) ; \
- cd $(top_srcdir)/../slice ; \
- for subdir in * ; \
- do \
@ -18,7 +18,7 @@
+# @if test ! -d $(install_slicedir) ; \
+# then \
+# echo "Creating $(install_slicedir)..." ; \
+# $(call mkdir,$(install_slicedir)) ; \
+# $(call mkdir, $(install_slicedir)) ; \
+# cd $(top_srcdir)/../slice ; \
+# for subdir in * ; \
+# do \

View File

@ -1,5 +1,5 @@
--- py/config/Make.rules.orig 2008-05-17 01:24:03.000000000 +0800
+++ py/config/Make.rules 2008-08-02 09:05:42.000000000 +0800
--- py/config/Make.rules.orig 2009-04-14 21:17:37.000000000 +0800
+++ py/config/Make.rules 2009-04-14 21:19:57.000000000 +0800
@@ -12,7 +12,9 @@
# if it does not exist.
#
@ -11,24 +11,7 @@
#
# The "root directory" for runpath embedded in executables. Can be unset
@@ -63,13 +65,13 @@
# version used for building the Ice extension, then set PYTHON_VERSION
# to "python2.3" or "python2.4".
#
- PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard /usr/include/python2.[345]*)))
+ PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard %%LOCALBASE%%/include/python2.[345]*)))
ifeq ($(PYTHON_VERSION),)
python_darwin_home = /System/Library/Frameworks/Python.framework/Versions/Current
PYTHON_VERSION = $(word 1,$(notdir $(wildcard $(python_darwin_home)/include/python2.[345]*)))
endif
- PYTHON_INCLUDE_DIR = /usr/include/$(PYTHON_VERSION)
- PYTHON_LIB_DIR = /usr/lib/$(PYTHON_VERSION)/config
+ PYTHON_INCLUDE_DIR = %%LOCALBASE%%/include/$(PYTHON_VERSION)
+ PYTHON_LIB_DIR = %%LOCALBASE%%/lib/$(PYTHON_VERSION)/config
endif
ifeq ($(PYTHON_VERSION),)
@@ -102,8 +104,8 @@
@@ -72,8 +74,8 @@
endif
libdir = $(top_srcdir)/python
@ -39,7 +22,7 @@
#
# Platform specific definitions
@@ -128,7 +130,7 @@
@@ -97,7 +99,7 @@
ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
ICE_FLAGS = -I$(ice_dir)/include
endif

View File

@ -57,14 +57,119 @@
%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VERSION%%
%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VRS%%
%%PYTHON_SITELIBDIR%%/Ice.pth
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyc
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice