From owner-freebsd-ports-bugs Thu Jan 23 6:40:21 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6ED8C37B405 for ; Thu, 23 Jan 2003 06:40:11 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E1A643F13 for ; Thu, 23 Jan 2003 06:40:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h0NEe7NS055456 for ; Thu, 23 Jan 2003 06:40:07 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0NEe7JB055455; Thu, 23 Jan 2003 06:40:07 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEBF537B401 for ; Thu, 23 Jan 2003 06:32:00 -0800 (PST) Received: from wrzx35.rz.uni-wuerzburg.de (wrzx35.rz.uni-wuerzburg.de [132.187.3.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id 026E843ED8 for ; Thu, 23 Jan 2003 06:31:58 -0800 (PST) (envelope-from q@coyote.dnsalias.net) Received: from wrzx30.rz.uni-wuerzburg.de (wrzx30.rz.uni-wuerzburg.de [132.187.1.30]) by wrzx35.rz.uni-wuerzburg.de (8.8.8/8.8.8/uniwue-MM-1.05) with ESMTP id PAA67344 for ; Thu, 23 Jan 2003 15:31:51 +0100 (CET) Received: from virusscan (localhost [127.0.0.1]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 892F3444F1 for ; Thu, 23 Jan 2003 15:31:51 +0100 (CET) Received: from wrzx07.rz.uni-wuerzburg.de (wrzx07.rz.uni-wuerzburg.de [132.187.1.7]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 6E6DD43ED4 for ; Thu, 23 Jan 2003 15:31:51 +0100 (CET) Received: from spamchecker (localhost [127.0.0.1]) by wrzx07.rz.uni-wuerzburg.de (Postfix) with ESMTP id 3F1D1473A for ; Thu, 23 Jan 2003 15:31:49 +0100 (CET) Received: from coyote.dnsalias.net (gb-007.galgenberg.net [132.187.222.7]) by wrzx07.rz.uni-wuerzburg.de (Postfix) with ESMTP id B598446F3 for ; Thu, 23 Jan 2003 15:31:48 +0100 (CET) Received: (from q@localhost) by coyote.dnsalias.net (8.12.6/8.12.6/Submit) id h0NEVkwm071571; Thu, 23 Jan 2003 15:31:46 +0100 (CET) Message-Id: <200301231431.h0NEVkwm071571@coyote.dnsalias.net> Date: Thu, 23 Jan 2003 15:31:46 +0100 (CET) From: Ulrich Spoerlein To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47406: [Patch] Remove {PERL} from ports@'s ports Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47406 >Category: ports >Synopsis: [Patch] Remove {PERL} from ports@'s ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jan 23 06:40:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD 4.7-STABLE: Mon Nov 18 09:46:38 CET 2002 i386 >Description: These patches remove some of the unecessary {PERL} dependancies from some ports without maintainer. Note: Some of these patches include portlint fixes too. deskutils/ithought doesn't contain any reference to gnome-config anymore. >How-To-Repeat: >Fix: --- patch1 begins here --- diff -urN /usr/ports/misc/xrmap/Makefile xrmap/Makefile --- /usr/ports/misc/xrmap/Makefile Mon Jan 6 03:16:15 2003 +++ xrmap/Makefile Thu Jan 23 01:02:56 2003 @@ -13,19 +13,16 @@ MAINTAINER= ports@FreeBSD.org +USE_REINPLACE= yes USE_IMAKE= yes USE_XPM= yes MAN1= xrmap.1 -PKGMESSAGE= ${WRKDIR}/pkg-message - post-patch: - @${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/Imakefile + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/Imakefile post-install: - @${SED} "s,%%PREFIX%%,${PREFIX}," < ${FILESDIR}/pkg-message.in > \ - ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} | ${SED} "s,%%PREFIX%%,${PREFIX}," .include diff -urN /usr/ports/misc/xrmap/files/pkg-message.in xrmap/files/pkg-message.in --- /usr/ports/misc/xrmap/files/pkg-message.in Sat Dec 28 03:16:19 2002 +++ xrmap/files/pkg-message.in Thu Jan 1 01:00:00 1970 @@ -1,6 +0,0 @@ -In order to use this port, you must download the data from one of the -following sites: - http://frmas.free.fr/li_1.htm - http://www.evl.uic.edu/pape/data/WDB/ - -Place the resulting data in %%PREFIX%%/share/rmap/. diff -urN /usr/ports/misc/xrmap/pkg-message xrmap/pkg-message --- /usr/ports/misc/xrmap/pkg-message Thu Jan 1 01:00:00 1970 +++ xrmap/pkg-message Sun Dec 22 21:22:37 2002 @@ -0,0 +1,6 @@ +In order to use this port, you must download the data from one of the +following sites: + http://frmas.free.fr/li_1.htm + http://www.evl.uic.edu/pape/data/WDB/ + +Place the resulting data in %%PREFIX%%/share/rmap/. --- patch1 ends here --- --- patch2 begins here --- diff -urN /usr/ports/x11/xcolorsel/Makefile xcolorsel/Makefile --- /usr/ports/x11/xcolorsel/Makefile Tue Nov 19 03:17:00 2002 +++ xcolorsel/Makefile Thu Jan 23 11:16:31 2003 @@ -16,16 +16,17 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d -WRKSRC= $(WRKDIR)/xcolorsel +WRKSRC= ${WRKDIR}/xcolorsel +USE_REINPLACE= yes USE_IMAKE= yes USE_XPM= yes MAN1= xcolorsel.1 post-patch: - ${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad - ${PERL} -pi -e "s|#include ||g; s|/Xaw/|/Xaw3d/|g;" \ + @${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad + @${REINPLACE_CMD} -e "s|#include ||g; s|/Xaw/|/Xaw3d/|g;" \ ${WRKSRC}/*.[ch] - ${PERL} -pi -e "s|app2head|./app2head|g; \ - s|XawClientLibs|-lXaw3d \\$$\(XMULIBONLY\) \\$$\(XTOOLLIB\) \\$$\(XPMLIB) \\$$\(XLIB\)|g" ${WRKSRC}/Imakefile + @${REINPLACE_CMD} -e 's|app2head|./app2head|g' \ + -e 's|XawClientLibs|-lXaw3d \$$\(XMULIBONLY\) \$$\(XTOOLLIB\) \$$\(XPMLIB) \$$\(XLIB\)|g' ${WRKSRC}/Imakefile .include --- patch2 ends here --- --- patch3 begins here --- diff -urN /usr/ports/x11-wm/libepplet/Makefile libepplet/Makefile --- /usr/ports/x11-wm/libepplet/Makefile Mon Dec 2 03:17:07 2002 +++ libepplet/Makefile Thu Jan 23 01:10:30 2003 @@ -16,6 +16,7 @@ WRKSRC= ${WRKDIR}/Epplets-${PORTVERSION} +USE_REINPLACE= yes USE_X_PREFIX= yes USE_GNOMENG= yes USE_GNOME= imlib @@ -26,6 +27,6 @@ INSTALLS_SHLIB= yes pre-patch: - @${PERL} -pi -e 's|api epplets|api|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|api epplets|api|g' ${WRKSRC}/Makefile.in .include --- patch3 ends here --- --- patch4 begins here --- diff -urN /usr/ports/deskutils/ithought/Makefile ithought/Makefile --- /usr/ports/deskutils/ithought/Makefile Mon Nov 11 03:15:23 2002 +++ ithought/Makefile Thu Jan 23 11:15:35 2003 @@ -13,19 +13,12 @@ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/libexec USE_GNOMENG= yes USE_GNOME= gtk12 - -post-patch: - @${PERL} -i.orig -p \ - -e 's#`gnome-config --cflags gtk`#`${GTK_CONFIG} --cflags`#;' \ - -e 's#`gnome-config --cflags gtk xml`#`${GTK_CONFIG} --cflags; xml-config --cflags`#;' \ - -e 's#`gnome-config --libs gtk xml`#`${GTK_CONFIG} --libs; xml-config --libs`#;' \ - ${WRKSRC}/src/Makefile.in .include --- patch4 ends here --- --- patch5 begins here --- diff -urN /usr/ports/deskutils/gnofin/Makefile gnofin/Makefile --- /usr/ports/deskutils/gnofin/Makefile Mon Nov 11 03:15:23 2002 +++ gnofin/Makefile Thu Jan 23 11:11:33 2003 @@ -13,6 +13,7 @@ MAINTAINER= ports@FreeBSD.org +USE_REINPLACE= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= yes @@ -23,14 +24,14 @@ MAN1= gnofin.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ - s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ - s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' - @find ${WRKSRC}/plugins -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g' + ${REINPLACE_CMD} -E -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \ + -e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g' \ + -e 's|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + find ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E\ + -e 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' \ + -e 's|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + find ${WRKSRC}/plugins -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \ + -e 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g' .include --- patch5 ends here --- --- patch6 begins here --- diff -urN /usr/ports/security/fwbuilder/Makefile fwbuilder/Makefile --- /usr/ports/security/fwbuilder/Makefile Thu Dec 12 03:18:08 2002 +++ fwbuilder/Makefile Thu Jan 23 01:28:04 2003 @@ -16,20 +16,22 @@ LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- +USE_REINPLACE= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes USE_GNOMELIBS= yes WITHOUT_ESOUND= yes -CONFIGURE_ARGS+= --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder +CONFIGURE_ARGS+=--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ \ + --with-templatedir=${X11BASE}/share/gnome/fwbuilder post-extract: - @${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\ - ${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in + @${REINPLACE_CMD} -e 's/lc_r/pthread/' ${WRKSRC}/configure ;\ + @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/etc/fwbuilder_prefs.xml.in .for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \ gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \ iptables/Makefile.in - @${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i + @${REINPLACE_CMD} -e 's|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|' ${WRKSRC}/src/$i .endfor .include --- patch6 ends here --- --- patch7 begins here --- diff -urN /usr/ports/www/dillo/Makefile dillo/Makefile --- /usr/ports/www/dillo/Makefile Sun Jan 5 03:16:52 2003 +++ dillo/Makefile Thu Jan 23 11:12:36 2003 @@ -5,9 +5,9 @@ # $FreeBSD: ports/www/dillo/Makefile,v 1.16 2003/01/04 14:14:43 anders Exp $ # -PORTNAME= dillo +PORTNAME= dillo PORTVERSION= 0.6.6 -CATEGORIES= www +CATEGORIES= www MASTER_SITES= http://dillo.auriga.wearlab.de/download/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -17,6 +17,7 @@ png.5:${PORTSDIR}/graphics/png \ intl.4:${PORTSDIR}/devel/gettext +USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes @@ -27,10 +28,10 @@ USE_GMAKE= yes post-patch: - ${PERL} -pi -e "s@-D_REENTRANT -D_THREAD_SAFE@@" ${WRKSRC}/configure - ${PERL} -pi -e "s@dillorc@dillorc.sample@g" ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e "s@-D_REENTRANT -D_THREAD_SAFE@@" ${WRKSRC}/configure + ${REINPLACE_CMD} -e "s@dillorc@dillorc.sample@g" ${WRKSRC}/Makefile.in ${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample - ${PERL} -pi -e "s@/usr/local/etc/dillorc@${PREFIX}/etc/dillorc@g" \ + ${REINPLACE_CMD} -e "s@/usr/local/etc/dillorc@${PREFIX}/etc/dillorc@g" \ ${WRKSRC}/src/prefs.c .include --- patch7 ends here --- --- patch8 begins here --- diff -urN /usr/ports/lang/cyclone/Makefile cyclone/Makefile --- /usr/ports/lang/cyclone/Makefile Fri Jan 3 03:18:11 2003 +++ cyclone/Makefile Thu Jan 23 00:53:17 2003 @@ -19,6 +19,7 @@ MAINTAINER= ports@FreeBSD.org +USE_REINPLACE= yes USE_GMAKE= yes NO_PACKAGE= 'Neither CC nor CFLAGS safe.' WRKSRC= ${WRKDIR}/${PORTNAME} @@ -35,7 +36,7 @@ post-patch: .ifndef(WITH_OPTIMIZED_CFLAGS) - @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${PERL} -pi -e \ + @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \ 's/-O3/-O/' .endif --- patch8 ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message