From f0000681746c861b50020b459d0d0d2cfcf0be8a Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 14 Aug 2008 22:28:54 +0000 Subject: - Update to 3.3.0 PR: 126195 126197 126198 Submitted by: Stefan Ehmann (maintainer) --- devel/py-ice/Makefile | 21 ++++--- devel/py-ice/distinfo | 6 +- devel/py-ice/files/patch-Makefile | 13 ----- devel/py-ice/files/patch-config+Make.common.rules | 46 +++++++++++++++ devel/py-ice/files/patch-config+Make.rules | 66 ---------------------- devel/py-ice/files/patch-config+Make.rules.FreeBSD | 29 ---------- .../files/patch-cpp+config+Make.rules.FreeBSD | 31 ++++++++++ devel/py-ice/files/patch-py+config+Make.rules | 50 ++++++++++++++++ devel/py-ice/files/patch-py+python+Makefile | 12 ++++ devel/py-ice/files/patch-python+Makefile | 12 ---- devel/py-ice/pkg-descr | 4 +- devel/py-ice/pkg-plist | 46 ++++++++------- 12 files changed, 180 insertions(+), 156 deletions(-) delete mode 100644 devel/py-ice/files/patch-Makefile create mode 100644 devel/py-ice/files/patch-config+Make.common.rules delete mode 100644 devel/py-ice/files/patch-config+Make.rules delete mode 100644 devel/py-ice/files/patch-config+Make.rules.FreeBSD create mode 100644 devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD create mode 100644 devel/py-ice/files/patch-py+config+Make.rules create mode 100644 devel/py-ice/files/patch-py+python+Makefile delete mode 100644 devel/py-ice/files/patch-python+Makefile (limited to 'devel/py-ice') diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile index bea9ccc6a936..1b29bae7ac8f 100644 --- a/devel/py-ice/Makefile +++ b/devel/py-ice/Makefile @@ -6,21 +6,25 @@ # PORTNAME= Ice -PORTVERSION= 3.2.1 +PORTVERSION= 3.3.0 CATEGORIES= devel python -MASTER_SITES= http://www.zeroc.com/download/Ice/3.2/ +MASTER_SITES= http://www.zeroc.com/download/Ice/3.3/ \ + http://www.dirk.sh/dirk/Ice/ PKGNAMEPREFIX= py- -DISTNAME= IcePy-${PORTVERSION} +DISTNAME= Ice-${PORTVERSION} MAINTAINER= dirk.ye@gmail.com COMMENT= An Ice (Internet Communications Engine) language mapping for Python +BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice USE_GMAKE= yes USE_PYTHON= yes +BUILD_WRKSRC= ${WRKSRC}/py +INSTALL_WRKSRC= ${WRKSRC}/py -LIB_VRS= ${PORTVERSION:S|.||g:C|1$||} +LIB_VRS= ${PORTVERSION:S|.||g:C|0$||} PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} @@ -31,21 +35,24 @@ CFLAGS+= -DNDEBUG .endif .include - .if ${ARCH} == "ia64" -BROKEN= does not compile +BROKEN= does not compile on ia64 .endif .if ((${ARCH} != i386) && (${ARCH} != powerpc)) MAKE_ENV= LP64=yes .endif +.if defined(NOPORTDOCS) +MAKE_ENV+= NOPORTDOCS=yes +.endif + post-patch: ${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g; \ s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config/Make.rules + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/py/config/Make.rules post-install: ${ECHO} "Ice" > ${PYTHON_SITELIBDIR}/Ice.pth diff --git a/devel/py-ice/distinfo b/devel/py-ice/distinfo index 0ea538ccdb33..fb9ca254c9f9 100644 --- a/devel/py-ice/distinfo +++ b/devel/py-ice/distinfo @@ -1,3 +1,3 @@ -MD5 (IcePy-3.2.1.tar.gz) = 2fdd8add2ea6271894392645f768e147 -SHA256 (IcePy-3.2.1.tar.gz) = 2a9ea57a370b8c0a4f3a880cbea03092f76efb417e27061f465278d95b720701 -SIZE (IcePy-3.2.1.tar.gz) = 166696 +MD5 (Ice-3.3.0.tar.gz) = 0500306d9cdbc0fbb553fbb529de557a +SHA256 (Ice-3.3.0.tar.gz) = 73330e29799d08605d51b9fc148fdc11eb01b6c55b7e4bf4dcb8fafd98ba7749 +SIZE (Ice-3.3.0.tar.gz) = 4260675 diff --git a/devel/py-ice/files/patch-Makefile b/devel/py-ice/files/patch-Makefile deleted file mode 100644 index 262924e5898d..000000000000 --- a/devel/py-ice/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Thu Mar 1 20:11:25 2007 -+++ Makefile Sat Mar 24 13:52:25 2007 -@@ -40,8 +40,8 @@ - done - - install:: -- $(call installdata,ICE_LICENSE,$(prefix)) -- $(call installdata,LICENSE,$(prefix)) -+ $(call installdata,ICE_LICENSE,$(install_libdir)) -+ $(call installdata,LICENSE,$(install_libdir)) - - test:: - @python $(top_srcdir)/allTests.py diff --git a/devel/py-ice/files/patch-config+Make.common.rules b/devel/py-ice/files/patch-config+Make.common.rules new file mode 100644 index 000000000000..efa36bde452d --- /dev/null +++ b/devel/py-ice/files/patch-config+Make.common.rules @@ -0,0 +1,46 @@ +--- 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)) ; \ + fi + +- @if test ! -d $(install_slicedir) ; \ +- then \ +- echo "Creating $(install_slicedir)..." ; \ +- $(call mkdir,$(install_slicedir)) ; \ +- cd $(top_srcdir)/../slice ; \ +- for subdir in * ; \ +- do \ +- echo "Copying slice/$$subdir to $(install_slicedir)..." ; \ +- cp -fpr $$subdir $(install_slicedir) ; \ +- done ; \ +- fi ++# @if test ! -d $(install_slicedir) ; \ ++# then \ ++# echo "Creating $(install_slicedir)..." ; \ ++# $(call mkdir,$(install_slicedir)) ; \ ++# cd $(top_srcdir)/../slice ; \ ++# for subdir in * ; \ ++# do \ ++# echo "Copying slice/$$subdir to $(install_slicedir)..." ; \ ++# cp -fpr $$subdir $(install_slicedir) ; \ ++# done ; \ ++# fi + +- @if test ! -f $(prefix)/ICE_LICENSE ; \ +- then \ +- $(call installdata,$(top_srcdir)/../ICE_LICENSE,$(prefix)) ; \ +- fi ++# @if test ! -f $(prefix)/ICE_LICENSE ; \ ++# then \ ++# $(call installdata,$(top_srcdir)/../ICE_LICENSE,$(prefix)) ; \ ++# fi + +- @if test ! -f $(prefix)/LICENSE ; \ +- then \ +- $(call installdata,$(top_srcdir)/../LICENSE,$(prefix)) ; \ +- fi ++# @if test ! -f $(prefix)/LICENSE ; \ ++# then \ ++# $(call installdata,$(top_srcdir)/../LICENSE,$(prefix)) ; \ ++# fi diff --git a/devel/py-ice/files/patch-config+Make.rules b/devel/py-ice/files/patch-config+Make.rules deleted file mode 100644 index 0c79c78e3bc7..000000000000 --- a/devel/py-ice/files/patch-config+Make.rules +++ /dev/null @@ -1,66 +0,0 @@ ---- config/Make.rules.orig Thu Mar 1 20:11:25 2007 -+++ config/Make.rules Fri Apr 13 19:42:32 2007 -@@ -7,6 +7,8 @@ - # - # ********************************************************************** - -+ICE_HOME = %%LOCALBASE%% -+ - ifndef ICE_HOME - ifneq ($(shell test -f /usr/include/Ice/Ice.h && echo 0),0) - $(error Ice installation not found, please set ICE_HOME!) -@@ -18,7 +20,7 @@ - # if it does not exist. - # - --prefix = /opt/IcePy-$(VERSION) -+prefix = %%PREFIX%% - - # - # The "root directory" for runpath embedded in executables. Can be unset -@@ -69,13 +71,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,10 +104,10 @@ - libdir = $(top_srcdir)/python - - install_slicedir = $(prefix)/slice --install_pythondir = $(prefix)/python -+install_pythondir = %%PYTHON_SITELIBDIR%%/Ice - --INSTALL = cp -fp --INSTALL_PROGRAM = ${INSTALL} -+INSTALL = install -C -o root -g wheel -m 444 -+INSTALL_PROGRAM = install -C -s -o root -g wheel -m 555 - INSTALL_LIBRARY = ${INSTALL} - INSTALL_DATA = ${INSTALL} - -@@ -136,12 +138,12 @@ - endif - - ifneq ($(ICE_HOME),) -- slicedir = $(ICE_HOME)/slice -+ slicedir = $(ICE_HOME)/share/Ice - else - slicedir = /usr/share/Ice-$(VERSION)/slice - endif - --install_libdir = $(prefix)/python -+install_libdir = %%PYTHON_SITELIBDIR%%/Ice - - ifneq ($(embedded_runpath_prefix),) - ifeq ($(LP64),yes) diff --git a/devel/py-ice/files/patch-config+Make.rules.FreeBSD b/devel/py-ice/files/patch-config+Make.rules.FreeBSD deleted file mode 100644 index 329ad4fd06fc..000000000000 --- a/devel/py-ice/files/patch-config+Make.rules.FreeBSD +++ /dev/null @@ -1,29 +0,0 @@ ---- config/Make.rules.FreeBSD.orig Wed Nov 16 03:51:31 2005 -+++ config/Make.rules.FreeBSD Thu Nov 17 16:19:46 2005 -@@ -20,7 +20,7 @@ - endif - - ifeq ($(OPTIMIZE),yes) -- CXXFLAGS += -O3 -DNDEBUG -+ CXXFLAGS += -O2 -DNDEBUG - else - CXXFLAGS += -g - endif -@@ -30,14 +30,14 @@ - # - CXXLIBS = - --mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r -+mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) - - mklib = ar cr $(1) $(2) - --BASELIBS = -lIceUtil -lc_r -+BASELIBS = -lIceUtil %%PTHREAD_LIBS%% - LIBS = -lIce $(BASELIBS) - --ICEUTIL_OS_LIBS = -+ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% - ICE_OS_LIBS = - - PLATFORM_HAS_READLINE = yes diff --git a/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD b/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD new file mode 100644 index 000000000000..41619d6da981 --- /dev/null +++ b/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD @@ -0,0 +1,31 @@ +--- cpp/config/Make.rules.FreeBSD.orig 2008-08-02 08:12:53.000000000 +0800 ++++ cpp/config/Make.rules.FreeBSD 2008-08-02 08:14:46.000000000 +0800 +@@ -27,7 +27,7 @@ + endif + + ifeq ($(OPTIMIZE),yes) +- CXXFLAGS += -O3 -DNDEBUG ++ CXXFLAGS += -O2 -DNDEBUG + else + CXXFLAGS += -g + endif +@@ -37,15 +37,15 @@ + # + CXXLIBS = + +-mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r ++mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) + + mklib = ar cr $(1) $(2) + +-BASELIBS = -lIceUtil -lc_r ++BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv + LIBS = -lIce $(BASELIBS) + +-ICEUTIL_OS_LIBS = +-ICE_OS_LIBS = ++ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% ++ICE_OS_LIBS = + + PLATFORM_HAS_READLINE = yes + diff --git a/devel/py-ice/files/patch-py+config+Make.rules b/devel/py-ice/files/patch-py+config+Make.rules new file mode 100644 index 000000000000..5e574ee56654 --- /dev/null +++ b/devel/py-ice/files/patch-py+config+Make.rules @@ -0,0 +1,50 @@ +--- 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 +@@ -12,7 +12,9 @@ + # if it does not exist. + # + +-prefix ?= /opt/Ice-$(VERSION) ++ICE_HOME = %%LOCALBASE%% ++ ++prefix ?= %%PREFIX%% + + # + # 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 @@ + endif + + libdir = $(top_srcdir)/python +-install_pythondir = $(prefix)/python +-install_libdir = $(prefix)/python ++install_pythondir = %%PYTHON_SITELIBDIR%%/Ice ++install_libdir = %%PYTHON_SITELIBDIR%%/Ice + + # + # Platform specific definitions +@@ -128,7 +130,7 @@ + ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) + ICE_FLAGS = -I$(ice_dir)/include + endif +-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil ++ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv + + ifneq ($(embedded_runpath_prefix),) + runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) diff --git a/devel/py-ice/files/patch-py+python+Makefile b/devel/py-ice/files/patch-py+python+Makefile new file mode 100644 index 000000000000..33d41fae561c --- /dev/null +++ b/devel/py-ice/files/patch-py+python+Makefile @@ -0,0 +1,12 @@ +--- py/python/Makefile.orig 2008-08-01 16:33:15.000000000 +0800 ++++ py/python/Makefile 2008-08-01 16:33:45.000000000 +0800 +@@ -230,7 +230,8 @@ + $(INSTALL_DATA) *.py $(install_pythondir) + @for i in $(PACKAGES) ; \ + do \ +- $(INSTALL_DATA) -r $$i $(install_pythondir) ; \ ++ $(INSTALL_DATA) -d $(install_pythondir)/$$i ; \ ++ $(INSTALL_DATA) $$i/*.py $(install_pythondir)/$$i ; \ + done + + clean:: diff --git a/devel/py-ice/files/patch-python+Makefile b/devel/py-ice/files/patch-python+Makefile deleted file mode 100644 index 2bd86a81ace4..000000000000 --- a/devel/py-ice/files/patch-python+Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- python/Makefile.orig Thu Feb 17 00:48:17 2005 -+++ python/Makefile Tue Aug 30 19:16:53 2005 -@@ -94,7 +94,8 @@ - $(INSTALL_DATA) *.py $(install_pythondir) - @for i in $(PACKAGES) ; \ - do \ -- $(INSTALL_DATA) -r $$i $(install_pythondir) ; \ -+ $(INSTALL_DATA) -d $(install_pythondir)/$$i ; \ -+ $(INSTALL_DATA) $$i/*.py $(install_pythondir)/$$i ; \ - done - - clean:: diff --git a/devel/py-ice/pkg-descr b/devel/py-ice/pkg-descr index 2bb829f7edec..5195f7b479fa 100644 --- a/devel/py-ice/pkg-descr +++ b/devel/py-ice/pkg-descr @@ -9,5 +9,5 @@ This Ice distribution is released under the GNU General Public License (GPL). WWW: http://www.zeroc.com/ -- Boris B. Samorodov -bsam@ipt.ru +- DIrk Ye +dirk.ye@gmail.com diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist index 29231f951065..f1d2b9355273 100644 --- a/devel/py-ice/pkg-plist +++ b/devel/py-ice/pkg-plist @@ -2,11 +2,21 @@ %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.py +%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py -%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice.py %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py +%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.py @@ -18,16 +28,6 @@ %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.py @@ -56,17 +56,15 @@ %%PYTHON_SITELIBDIR%%/Ice/IcePy.so %%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VERSION%% %%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VRS%% -%%PYTHON_SITELIBDIR%%/Ice/LICENSE -%%PYTHON_SITELIBDIR%%/Ice/ICE_LICENSE -%%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py -%%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py %%PYTHON_SITELIBDIR%%/Ice.pth -@dirrm %%PYTHON_SITELIBDIR%%/Ice/Glacier2 -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceBox -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceGrid -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IcePatch2 -@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceStorm -@dirrm %%PYTHON_SITELIBDIR%%/Ice +@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 -- cgit v1.2.3