diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2005-09-04 14:23:55 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-09-04 14:23:55 +0000 |
commit | 24aa3e3720cdb7c1e69ea6f0a9c199ac16c57d0e (patch) | |
tree | c2db109efe8ee6b2590db330a533083081192604 /devel/py-ice/files | |
parent | - Unbreak vpnc-disconnect by fixing the config.c patch (diff) |
Ice language mapping for Python.
Internet Communications Engine (Ice) is a modern alternative to object
middleware such as CORBA(TM) or COM/DCOM/COM+.
PR: ports/85546
Submitted by: Boris B. Samorodov <bsam@ipt.ru>
Notes
Notes:
svn path=/head/; revision=141914
Diffstat (limited to 'devel/py-ice/files')
-rw-r--r-- | devel/py-ice/files/patch-Makefile | 76 | ||||
-rw-r--r-- | devel/py-ice/files/patch-config+Make.rules | 56 | ||||
-rw-r--r-- | devel/py-ice/files/patch-config+Make.rules.FreeBSD | 18 | ||||
-rw-r--r-- | devel/py-ice/files/patch-python+Makefile | 12 |
4 files changed, 162 insertions, 0 deletions
diff --git a/devel/py-ice/files/patch-Makefile b/devel/py-ice/files/patch-Makefile new file mode 100644 index 000000000000..0a3f578f112e --- /dev/null +++ b/devel/py-ice/files/patch-Makefile @@ -0,0 +1,76 @@ +--- Makefile.orig Tue Aug 30 21:50:09 2005 ++++ Makefile Tue Aug 30 21:27:37 2005 +@@ -26,11 +26,11 @@ + $(call mkdir,$(install_libdir)) ; \ + fi + +- @if test ! -d $(install_slicedir) ; \ +- then \ +- echo "Creating $(install_slicedir)..." ; \ +- $(call mkdir,$(install_slicedir)) ; \ +- fi ++# @if test ! -d $(install_slicedir) ; \ ++# then \ ++# echo "Creating $(install_slicedir)..." ; \ ++# $(call mkdir,$(install_slicedir)) ; \ ++# fi + + @if test ! -d $(install_pythondir) ; \ + then \ +@@ -45,32 +45,32 @@ + ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ + done + +-install:: +- @if test -d slice ; \ +- then \ +- cd slice ; \ +- for i in * ; \ +- do \ +- if test ! -d $(install_slicedir)/$$i ; \ +- then \ +- echo "Creating $(install_slicedir)/$$i..." ; \ +- mkdir $(install_slicedir)/$$i ; \ +- chmod a+rx $(install_slicedir)/$$i ; \ +- fi ; \ +- cd $$i ; \ +- for f in *.ice ; \ +- do \ +- echo "Installing $$i/$$f" ; \ +- $(INSTALL_DATA) $$f $(install_slicedir)/$$i ; \ +- chmod a+r $(install_slicedir)/$$i/$$f ; \ +- done ; \ +- cd .. ; \ +- done \ +- fi ++#install:: ++# @if test -d slice ; \ ++# then \ ++# cd slice ; \ ++# for i in * ; \ ++# do \ ++# if test ! -d $(install_slicedir)/$$i ; \ ++# then \ ++# echo "Creating $(install_slicedir)/$$i..." ; \ ++# mkdir $(install_slicedir)/$$i ; \ ++# chmod a+rx $(install_slicedir)/$$i ; \ ++# fi ; \ ++# cd $$i ; \ ++# for f in *.ice ; \ ++# do \ ++# echo "Installing $$i/$$f" ; \ ++# $(INSTALL_DATA) $$f $(install_slicedir)/$$i ; \ ++# chmod a+r $(install_slicedir)/$$i/$$f ; \ ++# done ; \ ++# cd .. ; \ ++# done \ ++# fi + + 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.rules b/devel/py-ice/files/patch-config+Make.rules new file mode 100644 index 000000000000..eab3b7b92e82 --- /dev/null +++ b/devel/py-ice/files/patch-config+Make.rules @@ -0,0 +1,56 @@ +--- config/Make.rules.orig Fri Jun 24 01:36:53 2005 ++++ config/Make.rules Tue Aug 30 20:31:34 2005 +@@ -7,6 +7,8 @@ + # + # ********************************************************************** + ++ICE_HOME = %%LOCALBASE%% ++ + ifndef ICE_HOME + $(error ICE_HOME is not defined) + endif +@@ -16,7 +18,7 @@ + # if it does not exist. + # + +-prefix = /opt/IcePy-$(VERSION) ++prefix = %%PREFIX%% + + # + # Define OPTIMIZE as yes if you want to build with optimization. +@@ -65,13 +67,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.[34]*))) ++ PYTHON_VERSION ?= $(word 1,$(notdir $(wildcard %%LOCALBASE%%/include/python2.[34]*))) + ifeq ($(PYTHON_VERSION),) + python_darwin_home = /System/Library/Frameworks/Python.framework/Versions/Current + PYTHON_VERSION = $(word 1,$(notdir $(wildcard $(python_darwin_home)/include/python2.[34]*))) + 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) + endif + + ifeq ($(PYTHON_VERSION),) +@@ -103,14 +105,14 @@ + ifeq ($(LP64),yes) + install_libdir = $(prefix)/lib$(lp64suffix) + else +- install_libdir = $(prefix)/lib ++ install_libdir = %%PYTHON_SITELIBDIR%%/Ice + endif + + 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} + diff --git a/devel/py-ice/files/patch-config+Make.rules.FreeBSD b/devel/py-ice/files/patch-config+Make.rules.FreeBSD new file mode 100644 index 000000000000..0bff4deac237 --- /dev/null +++ b/devel/py-ice/files/patch-config+Make.rules.FreeBSD @@ -0,0 +1,18 @@ +--- config/Make.rules.FreeBSD.orig Tue Aug 30 16:02:02 2005 ++++ config/Make.rules.FreeBSD Tue Aug 30 16:02:50 2005 +@@ -26,12 +26,12 @@ + # + 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) + +-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-python+Makefile b/devel/py-ice/files/patch-python+Makefile new file mode 100644 index 000000000000..2bd86a81ace4 --- /dev/null +++ b/devel/py-ice/files/patch-python+Makefile @@ -0,0 +1,12 @@ +--- 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:: |