Date: Tue, 21 May 2002 06:09:03 +0900 (KST) From: Hye-Shik Chang <perky@fallin.lv> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38359: Update port: my ports for the world without perl Message-ID: <200205202109.g4KL93af039981@akaraka.yonsei.ac.kr>
next in thread | raw e-mail | index | archive | help
>Number: 38359
>Category: ports
>Synopsis: Update port: my ports for the world without perl
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon May 20 14:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Hye-Shik Chang
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Yonsei University
>Environment:
System: FreeBSD akaraka.yonsei.ac.kr 5.0-CURRENT FreeBSD 5.0-CURRENT #5: Sun May 5 12:24:46 KST 2002 root@akaraka.yonsei.ac.kr:/usr/src/sys/i386/compile/JOARRA i386
>Description:
Fix these for ${OSVERSION} >= 500036:
devel/decompyle
graphics/graphviz
graphics/py-gd
graphics/py-paint
misc/xosd
net/py-adns
net/py-google
lang/spl
textproc/py-rxp
www/apache2
>How-To-Repeat:
>Fix:
diff -ruN devel/decompyle.orig/Makefile devel/decompyle/Makefile
--- devel/decompyle.orig/Makefile Tue Apr 30 03:07:18 2002
+++ devel/decompyle/Makefile Tue May 21 04:41:19 2002
@@ -17,8 +17,15 @@
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.mk>
+.include <bsd.port.post.mk>
diff -ruN graphics/graphviz.orig/Makefile graphics/graphviz/Makefile
--- graphics/graphviz.orig/Makefile Fri Apr 26 23:08:52 2002
+++ graphics/graphviz/Makefile Tue May 21 04:54:33 2002
@@ -32,6 +32,7 @@
ACLOCAL=${LOCALBASE}/bin/aclocal14
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${PREFIX}/lib/graphviz
+MAKE_ENV= EXPR_COMPAT=yes
MAN1= acyclic.1 ccomps.1 colorize.1 dot.1 dotty.1 gc.1 gpr.1 \
lefty.1 neato.1 nop.1 prune.1 sccmap.1 tred.1 \
@@ -48,12 +49,6 @@
LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
CONFIGURE_ARGS= --with-iconvlibdir=${LOCALBASE}/lib
.endif
-
-post-patch:
-.if ${OSVERSION} >= 500032
- @${PERL} -pi.orig -e 's|expr |expr -- |' ${WRKSRC}/libtool
-.endif
-
post-install:
.if !defined(NOPORTDOCS)
diff -ruN graphics/py-gd.orig/Makefile graphics/py-gd/Makefile
--- graphics/py-gd.orig/Makefile Sat May 11 08:08:52 2002
+++ graphics/py-gd/Makefile Tue May 21 05:02:11 2002
@@ -24,11 +24,22 @@
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:
@@ -40,4 +51,4 @@
${INSTALL_DATA} ${WRKSRC}/gddemo.py ${EXAMPLE_DIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN graphics/py-paint.orig/Makefile graphics/py-paint/Makefile
--- graphics/py-paint.orig/Makefile Sat May 11 08:08:52 2002
+++ graphics/py-paint/Makefile Tue May 21 05:11:20 2002
@@ -32,8 +32,13 @@
.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 -ruN misc/xosd.orig/Makefile misc/xosd/Makefile
--- misc/xosd.orig/Makefile Tue Mar 26 18:33:03 2002
+++ misc/xosd/Makefile Tue May 21 05:25:25 2002
@@ -41,7 +41,4 @@
PLIST_SUB+= WITH_XMMS="@comment "
.endif
-pre-build:
- ${PERL} -pi -e "s@gcc@${CC}@g" ${WRKSRC}/Makefile
-
.include <bsd.port.mk>
diff -ruN net/py-adns.orig/Makefile net/py-adns/Makefile
--- net/py-adns.orig/Makefile Fri May 3 01:05:18 2002
+++ net/py-adns/Makefile Tue May 21 05:27:42 2002
@@ -20,9 +20,17 @@
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.mk>
+.include <bsd.port.post.mk>
diff -ruN net/py-google.orig/Makefile net/py-google/Makefile
--- net/py-google.orig/Makefile Mon Apr 29 02:31:16 2002
+++ net/py-google/Makefile Tue May 21 05:43:36 2002
@@ -24,15 +24,24 @@
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)
@@ -41,4 +50,4 @@
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN lang/spl.orig/Makefile lang/spl/Makefile
--- lang/spl.orig/Makefile Sun Mar 3 07:40:17 2002
+++ lang/spl/Makefile Tue May 21 05:55:36 2002
@@ -15,21 +15,30 @@
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,CCFLAGS,CFLAGS,g; s,^SPLPATH =.*,SPLPATH =${PREFIX},g; \
+ s, spl/, ${PREFIX}/,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
-do-install:
- ${TAR} -C ${WRKSRC}/spl -cf- . | ${TAR} -C ${PREFIX} -xpf-
+post-install:
.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.mk>
+.include <bsd.port.post.mk>
diff -ruN textproc/py-rxp.orig/Makefile textproc/py-rxp/Makefile
--- textproc/py-rxp.orig/Makefile Sat May 11 02:32:43 2002
+++ textproc/py-rxp/Makefile Tue May 21 05:58:31 2002
@@ -22,8 +22,14 @@
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:
@@ -32,4 +38,4 @@
${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN www/apache2.orig/Makefile www/apache2/Makefile
--- www/apache2.orig/Makefile Thu May 9 12:55:18 2002
+++ www/apache2/Makefile Tue May 21 06:00:36 2002
@@ -2,7 +2,7 @@
# Date created: 7 April 2001
# Whom: Hye-Shik Chang <perky@fallin.lv>
#
-# $FreeBSD$
+# $FreeBSD: ports/www/apache2/Makefile,v 1.114 2002/05/09 03:55:18 cy Exp $
#
PORTNAME= apache
@@ -28,9 +28,10 @@
HTTP_PORT?= 80
GNU_CONFIGURE= yes
+USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--enable-layout=FreeBSD \
- --with-perl=${PERL} \
+ --with-perl=${PERL5} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205202109.g4KL93af039981>