mirror of
https://git.freebsd.org/ports.git
synced 2025-07-08 12:59:17 -04:00
35717bde57
Changes from [*]: - Update Ice to 3.5.1. - Stageify all three ports. - Convert py-ice and php5-ice to slave ports. - Use ICONV_LIB, so it builds ok with native iconv [1]. - Workaround for FreeBSD 10's static destructor order disaster [2]. - Install man pages. - Allow package build for non-root users. [1] http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/using-iconv.html [2] http://lists.freebsd.org/pipermail/freebsd-ports/2013-June/084580.html Changes from [3]: - Convert LIB_DEPENDS to new syntax. - USE_GMAKE -> USES - list Berkeley DB 6 invalid, requires upstream changes, but upstream is loathe to make those due to licensing change in BDB - remove BDB 2 and 3 from invalid listing, we no longer have these ports PR: ports/184453 [*] PR: ports/185569 [3] Submitted by: Michael Gmelin (maintainer) [*] Submitted by: mandree [3] Approved by: Michael Gmelin (maintainer) [3]
41 lines
1.3 KiB
Text
41 lines
1.3 KiB
Text
--- py/config/Make.rules.orig 2013-03-11 15:19:47.000000000 +0000
|
|
+++ py/config/Make.rules 2013-05-20 14:21:13.335195726 +0000
|
|
@@ -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
|
|
@@ -96,8 +97,8 @@
|
|
|
|
libdir = $(top_srcdir)/python
|
|
ifneq ($(prefix), /usr)
|
|
-install_pythondir = $(prefix)/python
|
|
-install_libdir = $(prefix)/python
|
|
+install_pythondir = %%PYTHON_SITELIBDIR%%/Ice
|
|
+install_libdir = %%PYTHON_SITELIBDIR%%/Ice
|
|
else
|
|
ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
|
|
install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
|
|
@@ -128,7 +129,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 %%ICONV_LIB%%
|
|
|
|
ifneq ($(embedded_runpath_prefix),)
|
|
runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir)
|
|
@@ -167,7 +167,7 @@
|
|
|
|
all:: $(SRCS)
|
|
|
|
-%_ice.py: $(slicedir)/%.ice
|
|
+%_ice.py: $(ICE_HOME)/%.ice
|
|
rm -f $(*F).py
|
|
$(SLICE2PY) $(SLICE2PYFLAGS) $<
|
|
|