diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2014-01-09 01:57:20 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2014-01-09 01:57:20 +0000 |
| commit | 35717bde57f174079aca7b413f3f04576e86fdd1 (patch) | |
| tree | 3949c3a70930dbf0a4a925df2f214886b4bd20cf /devel/ice/files/patch-config-Make.common.rules | |
| parent | Add LIBOWN and LIBGRP to uidfix (diff) | |
Overhaul devel/ice, devel/py-ice and devel/php5-ice:
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]
Notes
Notes:
svn path=/head/; revision=339196
Diffstat (limited to 'devel/ice/files/patch-config-Make.common.rules')
| -rw-r--r-- | devel/ice/files/patch-config-Make.common.rules | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/devel/ice/files/patch-config-Make.common.rules b/devel/ice/files/patch-config-Make.common.rules index 7ba9dd1fadd1..8dd6eb5c8451 100644 --- a/devel/ice/files/patch-config-Make.common.rules +++ b/devel/ice/files/patch-config-Make.common.rules @@ -1,18 +1,45 @@ --- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000 +++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000 -@@ -378,11 +378,15 @@ +@@ -19,7 +19,7 @@ + SHORT_VERSION = 3.4 + SOVERSION = 34 + +-INSTALL = cp -fp ++INSTALL = %%INSTALL_PROGRAM%% + INSTALL_PROGRAM = ${INSTALL} + INSTALL_LIBRARY = ${INSTALL} + INSTALL_DATA = ${INSTALL} +@@ -386,11 +386,15 @@ then \ - echo "Creating $(install_slicedir)..." ; \ - $(call mkdir, $(install_slicedir)) ; \ + echo "Creating $(DESTDIR)$(install_slicedir)..." ; \ + $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \ + fi + -+ @if test -d $(install_slicedir) ; \ ++ @if test -d $(DESTDIR)$(install_slicedir) ; \ + then \ cd $(top_srcdir)/../slice ; \ for subdir in * ; \ do \ - echo "Copying slice/$$subdir to $(install_slicedir)..." ; \ - cp -fpr $$subdir $(install_slicedir) ; \ + echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ + cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ done ; \ - fi + fi + +@@ -410,12 +410,12 @@ + fi + + +- @if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \ ++ @if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \ + then \ +- $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \ ++ $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ + fi + +- @if test ! -f $(DESTDIR)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \ ++ @if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \ + then \ +- $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \ ++ $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ + fi |