From 24bef57523056955dd83d6de9766ba9e53bedd8a Mon Sep 17 00:00:00 2001 From: sem Date: Thu, 21 Apr 2005 11:40:38 +0000 Subject: - Unbreak - Pass maintainership to submitter PR: ports/80168 Submitted by: Renato Botelho --- print/perlftlib/Makefile | 20 ++++--------- print/perlftlib/files/patch-FreeType_FreeType.xs | 11 +++++++ print/perlftlib/files/patch-FreeType_Makefile.PL | 10 +++++++ print/perlftlib/files/patch-Makefile | 37 ++++++++++++++++++++++++ print/perlftlib/files/patch-aa | 35 ---------------------- print/perlftlib/files/patch-ab | 11 ------- print/perlftlib/files/patch-ac | 10 ------- print/perlftlib/pkg-plist | 2 -- 8 files changed, 64 insertions(+), 72 deletions(-) create mode 100644 print/perlftlib/files/patch-FreeType_FreeType.xs create mode 100644 print/perlftlib/files/patch-FreeType_Makefile.PL create mode 100644 print/perlftlib/files/patch-Makefile delete mode 100644 print/perlftlib/files/patch-aa delete mode 100644 print/perlftlib/files/patch-ab delete mode 100644 print/perlftlib/files/patch-ac (limited to 'print') diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile index acb1467a296..0bf9587556b 100644 --- a/print/perlftlib/Makefile +++ b/print/perlftlib/Makefile @@ -13,12 +13,10 @@ MASTER_SITES= http://www.io.com/~kazushi/xtt/ \ ${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 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} 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 diff --git a/print/perlftlib/files/patch-FreeType_FreeType.xs b/print/perlftlib/files/patch-FreeType_FreeType.xs new file mode 100644 index 00000000000..eab15e5f0ec --- /dev/null +++ b/print/perlftlib/files/patch-FreeType_FreeType.xs @@ -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 diff --git a/print/perlftlib/files/patch-FreeType_Makefile.PL b/print/perlftlib/files/patch-FreeType_Makefile.PL new file mode 100644 index 00000000000..9ff7ad62040 --- /dev/null +++ b/print/perlftlib/files/patch-FreeType_Makefile.PL @@ -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' + ); + diff --git a/print/perlftlib/files/patch-Makefile b/print/perlftlib/files/patch-Makefile new file mode 100644 index 00000000000..37ff19d2b24 --- /dev/null +++ b/print/perlftlib/files/patch-Makefile @@ -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) diff --git a/print/perlftlib/files/patch-aa b/print/perlftlib/files/patch-aa deleted file mode 100644 index 239c351c40d..00000000000 --- a/print/perlftlib/files/patch-aa +++ /dev/null @@ -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) diff --git a/print/perlftlib/files/patch-ab b/print/perlftlib/files/patch-ab deleted file mode 100644 index eab15e5f0ec..00000000000 --- a/print/perlftlib/files/patch-ab +++ /dev/null @@ -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 diff --git a/print/perlftlib/files/patch-ac b/print/perlftlib/files/patch-ac deleted file mode 100644 index 9ff7ad62040..00000000000 --- a/print/perlftlib/files/patch-ac +++ /dev/null @@ -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' - ); - diff --git a/print/perlftlib/pkg-plist b/print/perlftlib/pkg-plist index 05d9a4e36ff..014da54bc4d 100644 --- a/print/perlftlib/pkg-plist +++ b/print/perlftlib/pkg-plist @@ -6,6 +6,4 @@ bin/ftinfo %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/FreeType.pm -@comment I do not know how to treat the next files -@comment lib/perl5/%%PERL_VERSION%%/i386-freebsd/perllocal.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeType -- cgit