diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-05-23 22:22:19 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-05-23 22:22:19 +0000 |
commit | 03f189ed5b5a5559e1a2ac5154ffbb0d247b086e (patch) | |
tree | a7d8311612999f81e004ab9fe53399cfe729f724 | |
parent | Fix LIB_DEPENDS. (diff) |
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
Notes
Notes:
svn path=/head/; revision=59826
-rw-r--r-- | devel/decompyle/Makefile | 9 | ||||
-rw-r--r-- | dns/py-adns/Makefile | 10 | ||||
-rw-r--r-- | graphics/py-gd/Makefile | 13 | ||||
-rw-r--r-- | graphics/py-paint/Makefile | 5 | ||||
-rw-r--r-- | lang/spl/Makefile | 21 | ||||
-rw-r--r-- | net/py-adns/Makefile | 10 | ||||
-rw-r--r-- | net/py-google/Makefile | 13 | ||||
-rw-r--r-- | textproc/py-rxp/Makefile | 8 |
8 files changed, 13 insertions, 76 deletions
diff --git a/devel/decompyle/Makefile b/devel/decompyle/Makefile index 207bf6f22840..8038a0de865b 100644 --- a/devel/decompyle/Makefile +++ b/devel/decompyle/Makefile @@ -17,15 +17,8 @@ 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,/usr/bin/env python2,${PYTHON_CMD},' \ ${WRKSRC}/scripts/decompyle -.else - ${SED} -i.orig -e 's,/usr/bin/env python2,${PYTHON_CMD},' \ - ${WRKSRC}/scripts/decompyle -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile index 83e40776422b..b741415a3123 100644 --- a/dns/py-adns/Makefile +++ b/dns/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/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index cd248ee180ff..1fb2887e7c61 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -24,22 +24,11 @@ EXAMPLE_DIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} USE_XPM= yes .endif -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} < 500036 ${PERL} -pi -e 's,^(gd.*)$$,\1 -I${LOCALBASE}/include/gd -L${LOCALBASE}/lib,g; s,-lttf,,g; s,/usr/X11R6,${X11BASE},g;' \ ${WRKSRC}/Setup -.else - ${SED} -i.orig -e 's,^\(gd.*\)$$,\1 -I${LOCALBASE}/include/gd -L${LOCALBASE}/lib,g' \ - -e 's,-lttf,,g' -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Setup -.endif .if defined(WITHOUT_X11) -.if ${OSVERSION} < 500036 ${PERL} -pi -e 's,-lX11 -lXpm,,g' ${WRKSRC}/Setup -.else - ${SED} -i "" -e 's,-lX11 -lXpm,,g' ${WRKSRC}/Setup -.endif .endif pre-build: @@ -51,4 +40,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/gddemo.py ${EXAMPLE_DIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile index 24e1afc96d67..341a76721755 100644 --- a/graphics/py-paint/Makefile +++ b/graphics/py-paint/Makefile @@ -32,13 +32,8 @@ EXAMPLES= test_bar.py test_paint.py testpie.py .include <bsd.port.pre.mk> post-patch: -.if ${OSVERSION} < 500036 ${PERL} -pi -e 's@^(.*libraries.*)$$@\1include_dirs=${INC_DIRS},library_dirs=${LIB_DIRS},@g' \ ${WRKSRC}/setup.py -.else - ${SED} -i.orig -e 's@^\(.*libraries.*\)$$@\1include_dirs=${INC_DIRS},library_dirs=${LIB_DIRS},@g' \ - ${WRKSRC}/setup.py -.endif .if !defined(NOPORTDOCS) post-install: diff --git a/lang/spl/Makefile b/lang/spl/Makefile index 4212b5f2dc4f..0a0d4656caf6 100644 --- a/lang/spl/Makefile +++ b/lang/spl/Makefile @@ -15,30 +15,21 @@ MAINTAINER= perky@fallin.lv USE_BISON= yes USE_GMAKE= yes -ALL_TARGET= spl2c libspl.a ALL_EXAMPLES= Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \ primes.spl reverse.spl shakesbeer.spl -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} < 500036 @${PERL} -pi -e 's,= gcc,?= gcc,; s,^CCFLAGS.*,CFLAGS += -Wall,; \ - s,CCFLAGS,CFLAGS,g; s,^SPLPATH =.*,SPLPATH =${PREFIX},g; \ - s, spl/, ${PREFIX}/,g;' \ + s,CCFLAGS,CFLAGS,g' \ ${WRKSRC}/Makefile ${WRKSRC}/examples/Makefile -.else - @for f in ${WRKSRC}/Makefile ${WRKSRC}/examples/Makefile; do \ - ${SED} -i "" -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \ - -e 's,CCFLAGS,CFLAGS,g' -e 's,^SPLPATH =.*,SPLPATH =${PREFIX},g' \ - -e 's, spl/, ${PREFIX}/,g' $$f; \ - done -.endif -post-install: +do-install: + ${TAR} -C ${WRKSRC}/spl -cf- . | ${TAR} -C ${PREFIX} -xpf- .if !defined(NOPORTDOCS) ${MKDIR} ${EXAMPLESDIR} cd ${WRKSRC}/examples && ${INSTALL_DATA} ${ALL_EXAMPLES} ${EXAMPLESDIR} + @${PERL} -pi -e 's,^SPLPATH =.*,SPLPATH =${PREFIX},g' \ + ${EXAMPLESDIR}/Makefile .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> 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> diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile index 16bf922c7eb9..cde6feba8727 100644 --- a/textproc/py-rxp/Makefile +++ b/textproc/py-rxp/Makefile @@ -22,14 +22,8 @@ USE_PYDISTUTILS= yes EXAMPLESDIR= ${PREFIX}/share/examples/py-rxp DOCSDIR= ${PREFIX}/share/doc/py-rxp -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} < 500036 @${PERL} -pi -e 's/freebsd4/freebsd4","freebsd5/g' ${WRKSRC}/setup.py -.else - @${SED} -i.orig -e 's/freebsd4/freebsd4","freebsd5/g' ${WRKSRC}/setup.py -.endif .if !defined(NOPORTDOCS) post-install: @@ -38,4 +32,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |