diff options
| author | pat <pat@FreeBSD.org> | 2002-05-24 06:22:19 +0800 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-05-24 06:22:19 +0800 |
| commit | c54deb27de512ced04f48f48a6668977ece0ba70 (patch) | |
| tree | 98f1cfa3d42d9e110ef8367f90d94ae0e31e508a /net | |
| parent | 1867be1cca9ad1c85464c55c45879a81062459e0 (diff) | |
| download | freebsd-ports-gnome-c54deb27de512ced04f48f48a6668977ece0ba70.tar.gz freebsd-ports-gnome-c54deb27de512ced04f48f48a6668977ece0ba70.tar.zst freebsd-ports-gnome-c54deb27de512ced04f48f48a6668977ece0ba70.zip | |
back out commit made comparing OSVERSION and use sed(1) to workaround perl
on current issue. gotta back it out sooner or later.
/me puts on pointy hat
Requested by: many
Diffstat (limited to 'net')
| -rw-r--r-- | net/py-adns/Makefile | 10 | ||||
| -rw-r--r-- | net/py-google/Makefile | 13 |
2 files changed, 3 insertions, 20 deletions
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile index 83e40776422b..b741415a3123 100644 --- a/net/py-adns/Makefile +++ b/net/py-adns/Makefile @@ -20,17 +20,9 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} < 500036 @${PERL} -pi -e 's|^(include_dirs = ).*$$|\1\["${LOCALBASE}/include"\]|g; \ s|^(library_dirs = ).*$$|\1\["${LOCALBASE}/lib"\]|g' \ ${WRKSRC}/setup.py -.else - @${SED} -i.orig -e 's|^\(include_dirs = \).*$$|\1\["${LOCALBASE}/include"\]|g' \ - -e 's|^\(library_dirs = \).*$$|\1\["${LOCALBASE}/lib"\]|g' \ - ${WRKSRC}/setup.py -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/py-google/Makefile b/net/py-google/Makefile index cf9e7a7be960..5c2116e04df9 100644 --- a/net/py-google/Makefile +++ b/net/py-google/Makefile @@ -24,24 +24,15 @@ EXTRACT_BEFORE_ARGS= -q -aa WRKSRC= ${WRKDIR}/pygoogle EXAMPLESDIR= ${PREFIX}/share/examples/py-google -.include <bsd.port.pre.mk> - post-patch: # www/py-websvcs has an incompatible version of SOAP.py @${MV} ${WRKSRC}/SOAP.py ${WRKSRC}/SOAPgoogle.py -.if ${OSVERSION} < 500036 @cd ${WRKSRC}; for f in *.py; do \ ${PERL} -pi -e 's,import SOAP,import SOAPgoogle as SOAP,g' $$f; \ done - @${PERL} -pi -e 's,.*extra_path.*,,g' ${WRKSRC}/setup.py -.else - @cd ${WRKSRC}; for f in *.py; do \ - ${SED} -i "" -e 's,import SOAP,import SOAPgoogle as SOAP,g' $$f; \ - done - @${SED} -i.orig -e 's,.*extra_path.*,,g' ${WRKSRC}/setup.py -.endif @${MKDIR} ${WRKSRC}/tests @${MV} ${WRKSRC}/*test*.py ${WRKSRC}/tests + @${PERL} -pi -e 's,.*extra_path.*,,g' ${WRKSRC}/setup.py post-install: .if !defined(NOPORTDOCS) @@ -50,4 +41,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> |