Attachment 107682 Details for Bug 148492 – file.diff

[patch] file.diff

file.diff (text/plain), 8.92 KB, created by tonymaher on 2010-07-11 07:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tonymaher

Created: 2010-07-11 07:40:05 UTC

Size: 8.92 KB

patch

obsolete

>diff -ruN py-ice.orig/Makefile py-ice/Makefile
>--- py-ice.orig/Makefile	2009-08-19 06:15:53.000000000 +1000
>+++ py-ice/Makefile	2010-07-10 21:41:14.000000000 +1000
>@@ -6,9 +6,9 @@
> #
> 
> PORTNAME=	Ice
>-PORTVERSION=	3.3.1
>+PORTVERSION=	3.4.1
> CATEGORIES=	devel python
>-MASTER_SITES=	http://www.zeroc.com/download/Ice/3.3/ \
>+MASTER_SITES=	http://www.zeroc.com/download/Ice/3.4/ \
> 		http://www.dirk.sh/dirk/Ice/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> DISTNAME=	Ice-${PORTVERSION}
>@@ -16,7 +16,7 @@
> MAINTAINER=	dirk.ye@gmail.com
> COMMENT=	An Ice (Internet Communications Engine) language mapping for Python
> 
>-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp
>+BUILD_DEPENDS=	mcpp.3:${PORTSDIR}/devel/mcpp
> LIB_DEPENDS=	Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
> 
> USE_GMAKE=	yes
>diff -ruN py-ice.orig/distinfo py-ice/distinfo
>--- py-ice.orig/distinfo	2009-05-24 01:21:03.000000000 +1000
>+++ py-ice/distinfo	2010-07-11 10:56:49.000000000 +1000
>@@ -1,3 +1,3 @@
>-MD5 (Ice-3.3.1.tar.gz) = 1f37dfcec4662fcde030553fb447d064
>-SHA256 (Ice-3.3.1.tar.gz) = 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0
>-SIZE (Ice-3.3.1.tar.gz) = 4455154
>+MD5 (Ice-3.4.1.tar.gz) = 3aae42aa47dec74bb258c1a1b2847a1a
>+SHA256 (Ice-3.4.1.tar.gz) = 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6
>+SIZE (Ice-3.4.1.tar.gz) = 5263510
>diff -ruN py-ice.orig/files/patch-config+Make.common.rules py-ice/files/patch-config+Make.common.rules
>--- py-ice.orig/files/patch-config+Make.common.rules	2009-05-24 01:21:03.000000000 +1000
>+++ py-ice/files/patch-config+Make.common.rules	2010-07-11 13:41:47.000000000 +1000
>@@ -1,46 +1,11 @@
>---- 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
>+--- config/Make.common.rules.orig	2010-07-11 13:40:06.000000000 +1000
>++++ config/Make.common.rules	2010-07-11 13:40:43.000000000 +1000
>+@@ -19,7 +19,7 @@
>+ SHORT_VERSION           = 3.4
>+ SOVERSION		= 34
>  
>--	@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
>+-INSTALL			= cp -fp
>++INSTALL			= install
>+ INSTALL_PROGRAM		= ${INSTALL}
>+ INSTALL_LIBRARY		= ${INSTALL}
>+ INSTALL_DATA		= ${INSTALL}
>diff -ruN py-ice.orig/files/patch-cpp+config+Make.rules.FreeBSD py-ice/files/patch-cpp+config+Make.rules.FreeBSD
>--- py-ice.orig/files/patch-cpp+config+Make.rules.FreeBSD	2008-08-15 08:28:54.000000000 +1000
>+++ py-ice/files/patch-cpp+config+Make.rules.FreeBSD	2010-07-11 11:08:50.000000000 +1000
>@@ -1,5 +1,5 @@
>---- 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
>+--- cpp/config/Make.rules.FreeBSD.orig	2010-07-11 11:00:46.000000000 +1000
>++++ cpp/config/Make.rules.FreeBSD	2010-07-11 11:07:28.000000000 +1000
> @@ -27,7 +27,7 @@
>  endif
>  
>@@ -19,13 +19,12 @@
>  mklib			= ar cr $(1) $(2)
>  
> -BASELIBS		= -lIceUtil -lc_r
>-+BASELIBS		= -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv
>++BASELIBS		= -lIceUtil %%PTHREAD_LIBS%%
>  LIBS			= -lIce $(BASELIBS)
>  
>--ICEUTIL_OS_LIBS		= 
>+ ICEUTIL_OS_LIBS		= 
> -ICE_OS_LIBS		= 
>-+ICEUTIL_OS_LIBS		= %%PTHREAD_LIBS%% 
>-+ICE_OS_LIBS		=
>++ICE_OS_LIBS		= %%PTHREAD_LIBS%%
>  
>  PLATFORM_HAS_READLINE	= yes
>  
>diff -ruN py-ice.orig/files/patch-py+config+Make.rules py-ice/files/patch-py+config+Make.rules
>--- py-ice.orig/files/patch-py+config+Make.rules	2009-05-24 01:21:03.000000000 +1000
>+++ py-ice/files/patch-py+config+Make.rules	2010-07-11 15:29:27.000000000 +1000
>@@ -1,17 +1,16 @@
>---- 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 @@
>+--- py/config/Make.rules.orig	2010-07-11 11:13:30.000000000 +1000
>++++ py/config/Make.rules	2010-07-11 11:18:09.000000000 +1000
>+@@ -12,7 +12,8 @@
>  # 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
>-@@ -72,8 +74,8 @@
>+@@ -80,8 +81,8 @@
>  endif
>  
>  libdir			= $(top_srcdir)/python
>@@ -22,7 +21,7 @@
>  
>  #
>  # Platform specific definitions
>-@@ -97,7 +99,7 @@
>+@@ -105,7 +106,7 @@
>      ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
>      ICE_FLAGS	= -I$(ice_dir)/include
>  endif
>diff -ruN py-ice.orig/files/patch-py+python+Makefile py-ice/files/patch-py+python+Makefile
>--- py-ice.orig/files/patch-py+python+Makefile	2008-08-15 08:28:54.000000000 +1000
>+++ py-ice/files/patch-py+python+Makefile	2010-07-11 13:29:03.000000000 +1000
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- py/python/Makefile.orig	2010-07-11 13:05:38.000000000 +1000
>++++ py/python/Makefile	2010-07-11 13:09:09.000000000 +1000
>+@@ -121,7 +121,8 @@
>  	$(INSTALL_DATA) *.py $(install_pythondir)
>  	@for i in $(PACKAGES) ; \
>  	do \
>@@ -9,4 +9,4 @@
> +	    $(INSTALL_DATA) $$i/*.py $(install_pythondir)/$$i ; \
>  	done
>  
>- clean::
>+ depend::  $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE)
>diff -ruN py-ice.orig/pkg-plist py-ice/pkg-plist
>--- py-ice.orig/pkg-plist	2009-05-24 01:21:03.000000000 +1000
>+++ py-ice/pkg-plist	2010-07-11 15:01:08.000000000 +1000
>@@ -3,8 +3,8 @@
> %%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.py
> %%PYTHON_SITELIBDIR%%/Ice/Ice.py
> %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py
> %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py
>@@ -27,6 +27,8 @@
> %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.py
> %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.py
> %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.py
>+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.py
>+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.py
> %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py
> %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py
> %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py
>@@ -62,7 +64,6 @@
> @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
>@@ -117,7 +118,6 @@
> @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
>@@ -167,9 +167,14 @@
> @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/__init__.py
> @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
>+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py
>+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox
>+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py
>+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid
>+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py
>+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
>+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py
>+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
> @dirrmtry %%PYTHON_SITELIBDIR%%/Ice

Actions: View | Diff

Attachments on bug 148492: 107682