diff options
| author | daichi <daichi@FreeBSD.org> | 2011-12-13 01:43:50 +0800 |
|---|---|---|
| committer | daichi <daichi@FreeBSD.org> | 2011-12-13 01:43:50 +0800 |
| commit | 835ef7d20c67e911723d7070fb7af09c33872f2f (patch) | |
| tree | 2dce354381fa783471f4c4814370f77d49de22f9 /devel | |
| parent | 67bfc67944870b0b8527302540a1e4c3f2e59aca (diff) | |
| download | freebsd-ports-graphics-835ef7d20c67e911723d7070fb7af09c33872f2f.tar.gz freebsd-ports-graphics-835ef7d20c67e911723d7070fb7af09c33872f2f.tar.zst freebsd-ports-graphics-835ef7d20c67e911723d7070fb7af09c33872f2f.zip | |
- fixed a gcc 4.2.1 's namespace bug. Now mozc can build
himself using the system's default gcc.
- removed the dependency for external gyp
- removed the gsed dependency
- removed the gnugrep dependency
- refined the mozc relative ports
Feature safe: yes
Submitted by: hrs
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/py-gyp-devel/Makefile | 14 | ||||
| -rw-r--r-- | devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py | 22 |
2 files changed, 7 insertions, 29 deletions
diff --git a/devel/py-gyp-devel/Makefile b/devel/py-gyp-devel/Makefile index c7bc9f90187..d8f2dd3db27 100644 --- a/devel/py-gyp-devel/Makefile +++ b/devel/py-gyp-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= gyp PORTVERSION= r832 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= http://people.freebsd.org/~daichi/distfiles/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,20 +15,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= daichi@FreeBSD.org COMMENT= Generate Your Projects -RUN_DEPENDS= gsed:${PORTSDIR}/textproc/gsed \ - ${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep - USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGVERSION= 0.1 -REPLACE_FILES= ${WRKSRC}/pylib/gyp/generator/make.py - -post-patch: - @for FILE in ${REPLACE_FILES}; \ - do \ - ${SED} -i .bak -e "s/@@LOCALBASE@@/${LOCALBASE:S/\//\\\//g}/g" \ - $${FILE}; \ - done; - .include <bsd.port.mk> diff --git a/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py b/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py index 8a5503db2b7..f5bed88042d 100644 --- a/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py +++ b/devel/py-gyp-devel/files/patch-pylib_gyp_generator_make.py @@ -1,21 +1,11 @@ ---- pylib/gyp/generator/make.py.org 2010-09-03 18:36:39.151835296 +0900 -+++ pylib/gyp/generator/make.py 2010-09-03 18:55:43.973773838 +0900 -@@ -177,14 +177,14 @@ - r""" - define fixup_dep - # Fixup path as in (1). --sed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) -+gsed -e "s|^$(notdir $@)|$@|" $(depfile).raw >> $(depfile) - # Add extra rules as in (2). +--- pylib/gyp/generator/make.py.orig 2010-06-26 08:55:39.000000000 +0900 ++++ pylib/gyp/generator/make.py 2011-12-11 22:54:34.000000000 +0900 +@@ -182,7 +182,7 @@ # We remove slashes and replace spaces with new lines; # remove blank lines; # delete the first line and append a colon to the remaining lines. -sed -e 's|\\||' -e 's| |\n|g' $(depfile).raw |\ -- grep -v '^$$' |\ -- sed -e 1d -e 's|$$|:|' \ -+gsed -e 's|\\||' -e 's| |\n|g' $(depfile).raw |\ -+ @@LOCALBASE@@/bin/grep -E -v '^$$' |\ -+ gsed -e 1d -e 's|$$|:|' \ ++env NL=`printf "\n"` sed -e 's|\\||' -e 's| |${NL}|g' $(depfile).raw |\ + grep -v '^$$' |\ + sed -e 1d -e 's|$$|:|' \ >> $(depfile) - rm $(depfile).raw - endef |