From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 20 19:50:24 2005 Return-Path: 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 5BEEA16A4CF for ; Wed, 20 Apr 2005 19:50:24 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8AFB43D3F for ; Wed, 20 Apr 2005 19:50:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3KJoNCO027255 for ; Wed, 20 Apr 2005 19:50:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3KJoNR8027254; Wed, 20 Apr 2005 19:50:23 GMT (envelope-from gnats) Resent-Date: Wed, 20 Apr 2005 19:50:23 GMT Resent-Message-Id: <200504201950.j3KJoNR8027254@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8235116A4CE for ; Wed, 20 Apr 2005 19:43:19 +0000 (GMT) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0107143D55 for ; Wed, 20 Apr 2005 19:43:18 +0000 (GMT) (envelope-from renato@data.galle.com.br) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by data.galle.com.br (8.13.1/8.13.1) with ESMTP id j3KJhGud028921 for ; Wed, 20 Apr 2005 16:43:16 -0300 (BRST) (envelope-from renato@data.galle.com.br) Received: (from root@localhost) by data.galle.com.br (8.13.1/8.13.1/Submit) id j3KJhBmI028920; Wed, 20 Apr 2005 16:43:11 -0300 (BRST) (envelope-from renato) Message-Id: <200504201943.j3KJhBmI028920@data.galle.com.br> Date: Wed, 20 Apr 2005 16:43:11 -0300 (BRST) From: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80168: [PATCH] print/perlftlib: Unbreak, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2005 19:50:24 -0000 >Number: 80168 >Category: ports >Synopsis: [PATCH] print/perlftlib: Unbreak, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 20 19:50:23 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.3-RELEASE-p9 i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.3-RELEASE-p9 FreeBSD 5.3-RELEASE-p9 #9: Fri Apr 15 07:52:00 BRST 2005 >Description: - Unbreak - Change patch filenames - Use ${PERL} -pi instead ${MV} and ${SED} - Take maintainership Added file(s): - files/patch-FreeType_FreeType.xs - files/patch-FreeType_Makefile.PL - files/patch-Makefile Removed file(s): - files/patch-aa - files/patch-ab - files/patch-ac Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- perlftlib-1.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/print/perlftlib/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 12 Feb 2005 00:47:40 -0000 1.17 +++ Makefile 20 Apr 2005 19:41:56 -0000 @@ -13,12 +13,10 @@ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= sada -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd@galle.com.br COMMENT= Libraries to use the FreeType library from the perl language -RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/jcode.pl:${PORTSDIR}/japanese/jcode.pl - -BROKEN= Installs perllocal.pod +RUN_DEPENDS= ${SITE_PERL}/jcode.pl:${PORTSDIR}/japanese/jcode.pl USE_FREETYPE= yes USE_PERL5= yes @@ -30,17 +28,11 @@ MAKE_ENV= PERL_VER=${PERL_VER} PERL5=${PERL5} pre-patch: - ${MV} ${WRKSRC}/FreeType/Makefile.PL ${WRKSRC}/FreeType/Makefile.PL.bak - ${SED} 's,/usr/local/X11R6.3,${PREFIX},' \ - ${WRKSRC}/FreeType/Makefile.PL.bak \ - > ${WRKSRC}/FreeType/Makefile.PL + @${PERL} -pi -e 's!/usr/local/X11R6.3!${PREFIX}!' ${WRKSRC}/FreeType/Makefile.PL post-build: - cd ${WRKSRC}; \ - for DIST in ftinfo mkttfdir; do \ - ${MV} $${DIST} $${DIST}.bak; \ - ${SED} -e 's;^#! */usr/local/bin/perl *;#!${PERL5};' \ - $${DIST}.bak > $${DIST}; \ - done +.for DIST in ftinfo mkttfdir + @${PERL} -pi -e 's;^#! */usr/local/bin/perl *;#!${PERL5};' ${WRKSRC}/${DIST} +.endfor .include Index: files/patch-FreeType_FreeType.xs =================================================================== RCS file: files/patch-FreeType_FreeType.xs diff -N files/patch-FreeType_FreeType.xs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-FreeType_FreeType.xs 20 Apr 2005 19:41:56 -0000 @@ -0,0 +1,11 @@ +--- FreeType/FreeType.xs.orig Mon Dec 14 14:13:26 1998 ++++ FreeType/FreeType.xs Tue Jul 18 21:56:29 2000 +@@ -12,6 +12,8 @@ + #include "EXTERN.h" + #include "perl.h" + #include "XSUB.h" ++#define PERL_POLLUTE 1 ++#include "embedvar.h" + #ifdef __cplusplus + } + #endif Index: files/patch-FreeType_Makefile.PL =================================================================== RCS file: files/patch-FreeType_Makefile.PL diff -N files/patch-FreeType_Makefile.PL --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-FreeType_Makefile.PL 20 Apr 2005 19:41:56 -0000 @@ -0,0 +1,10 @@ +--- FreeType/Makefile.PL.orig Wed Jan 10 14:50:46 2001 ++++ FreeType/Makefile.PL Wed Jan 10 14:51:19 2001 +@@ -6,5 +6,5 @@ + 'VERSION_FROM' => 'FreeType.pm', # finds $VERSION + 'LIBS' => ['-L/usr/local/lib -lttf'], # e.g., '-lm' + 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' +- 'INC' => '-I/usr/local/include', # e.g., '-I/usr/include/other' ++ 'INC' => '-I/usr/local/include/freetype1/freetype', # e.g., '-I/usr/include/other' + ); + Index: files/patch-Makefile =================================================================== RCS file: files/patch-Makefile diff -N files/patch-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile 20 Apr 2005 19:41:56 -0000 @@ -0,0 +1,37 @@ +--- Makefile.orig Mon Dec 14 02:13:26 1998 ++++ Makefile Wed Apr 20 16:31:11 2005 +@@ -1,8 +1,8 @@ + +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man/man1 +-PERL = perl +-PERLLIBDIR = /usr/local/lib/perl5/site_perl ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man1 ++PERL = ${PERL5} ++PERLLIBDIR = ${PREFIX}/lib/perl5/site_perl + + VERSION = 1.2 + +@@ -12,7 +12,9 @@ + all: $(FREETYPELIB) $(PROGRAMS) $(MANFILES) + + install: installlib $(PROGRAMS) +- cp $(PROGRAMS) $(BINDIR) ++ for file in $(PROGRAMS); do \ ++ ${BSD_INSTALL_SCRIPT} $${file} $(BINDIR); \ ++ done + rm -f $(MANDIR)/ftinfo.1 + ln -s $(BINDIR)/ftinfo $(MANDIR)/ftinfo.1 + rm -f $(MANDIR)/mkttfdir.1 +@@ -42,8 +44,8 @@ + cp $? $@ + + installlib: $(FREETYPELIB) +- cd FreeType; $(MAKE) $(MFLAGS) install +- cp FreeTypeWrapper.pm $(PERLLIBDIR) ++ cd FreeType; $(MAKE) $(MFLAGS) pure_install ++ cp FreeTypeWrapper.pm $(PERLLIBDIR)/${PERL_VER} + + $(FREETYPELIB): FreeType/Makefile + cd FreeType; $(MAKE) $(MFLAGS) Index: files/patch-aa =================================================================== RCS file: files/patch-aa diff -N files/patch-aa --- files/patch-aa 1 Jan 1999 22:18:54 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ ---- ./Makefile.orig Mon Dec 14 14:13:26 1998 -+++ ./Makefile Tue Dec 22 16:14:46 1998 -@@ -1,8 +1,8 @@ - --BINDIR = /usr/local/bin --MANDIR = /usr/local/man/man1 --PERL = perl --PERLLIBDIR = /usr/local/lib/perl5/site_perl -+BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/man1 -+PERL = ${PERL5} -+PERLLIBDIR = ${PREFIX}/lib/perl5/site_perl - - VERSION = 1.2 - -@@ -12,7 +12,9 @@ - all: $(FREETYPELIB) $(PROGRAMS) $(MANFILES) - - install: installlib $(PROGRAMS) -- cp $(PROGRAMS) $(BINDIR) -+ for file in $(PROGRAMS); do \ -+ ${BSD_INSTALL_SCRIPT} $${file} $(BINDIR); \ -+ done - rm -f $(MANDIR)/ftinfo.1 - ln -s $(BINDIR)/ftinfo $(MANDIR)/ftinfo.1 - rm -f $(MANDIR)/mkttfdir.1 -@@ -43,7 +45,7 @@ - - installlib: $(FREETYPELIB) - cd FreeType; $(MAKE) $(MFLAGS) install -- cp FreeTypeWrapper.pm $(PERLLIBDIR) -+ cp FreeTypeWrapper.pm $(PERLLIBDIR)/${PERL_VER} - - $(FREETYPELIB): FreeType/Makefile - cd FreeType; $(MAKE) $(MFLAGS) Index: files/patch-ab =================================================================== RCS file: files/patch-ab diff -N files/patch-ab --- files/patch-ab 19 Jul 2000 00:41:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- FreeType/FreeType.xs.orig Mon Dec 14 14:13:26 1998 -+++ FreeType/FreeType.xs Tue Jul 18 21:56:29 2000 -@@ -12,6 +12,8 @@ - #include "EXTERN.h" - #include "perl.h" - #include "XSUB.h" -+#define PERL_POLLUTE 1 -+#include "embedvar.h" - #ifdef __cplusplus - } - #endif Index: files/patch-ac =================================================================== RCS file: files/patch-ac diff -N files/patch-ac --- files/patch-ac 14 Mar 2002 11:16:43 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- FreeType/Makefile.PL.orig Wed Jan 10 14:50:46 2001 -+++ FreeType/Makefile.PL Wed Jan 10 14:51:19 2001 -@@ -6,5 +6,5 @@ - 'VERSION_FROM' => 'FreeType.pm', # finds $VERSION - 'LIBS' => ['-L/usr/local/lib -lttf'], # e.g., '-lm' - 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' -- 'INC' => '-I/usr/local/include', # e.g., '-I/usr/include/other' -+ 'INC' => '-I/usr/local/include/freetype1/freetype', # e.g., '-I/usr/include/other' - ); - --- perlftlib-1.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: