- Upgrade to 804.027.

- add a patch for USE_XFT.

PR:		ports/67235
Submitted by:	michael johnson <ahze@ahze.net>
Approved by:	maintainer

4 files changed, 33 insertions, 7 deletions

diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 4e3947eaf6cd..7e7621c7aa77 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	Tk
-PORTVERSION=	804.025.b16
+PORTVERSION=	804.027
 CATEGORIES=	x11-toolkits tk84 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tk
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}_beta16
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	A re-port of a perl5 interface to Tk8.4
@@ -22,6 +21,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 MAN1=		ptked.1 \
 		ptksh.1 \
+		tkjpeg.1 \
 		widget.1
 
 MAN3=		Tie::Watch.3 \
@@ -147,6 +147,24 @@ MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 IGNORE=		"This port needs Perl 5.8.0 or greater, please upgrade your Perl!"
 .endif
 
+.if defined(WITH_XFT)
+CONFIGURE_ARGS=	XFT=1
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+.endif
+
+.if !defined(WITH_XFT)
+pre-everything::
+	@${ECHO_MSG} "===>"
+	@${ECHO_MSG} "===> An experimental implementation of client side fonts"
+	@${ECHO_MSG} "===> and anti-aliased fonts via Xft"
+	@${ECHO_MSG} "===> can be enabled by defining WITH_XFT"
+	@${ECHO_MSG} "===>"
+.endif
+
+post-patch:
+	@${PERL} -i -p -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/pTk/Makefile.PL
+
 post-configure:
 	@${PERL} -i -p \
 		-e 's|^(CC = ).*|$$1 ${CC}|;' \
diff --git a/x11-toolkits/p5-Tk/distinfo b/x11-toolkits/p5-Tk/distinfo
index e76dc2aafa16..4ac370bb8a7c 100644
--- a/x11-toolkits/p5-Tk/distinfo
+++ b/x11-toolkits/p5-Tk/distinfo
@@ -1,2 +1,2 @@
-MD5 (Tk-804.025_beta16.tar.gz) = e2aff41f1693f31c8731883c242d609f
-SIZE (Tk-804.025_beta16.tar.gz) = 6006927
+MD5 (Tk-804.027.tar.gz) = d1ca4a6bff6dae4d937fabde4e86256b
+SIZE (Tk-804.027.tar.gz) = 6011130
diff --git a/x11-toolkits/p5-Tk/files/patch-pTk-Makefile.PL b/x11-toolkits/p5-Tk/files/patch-pTk-Makefile.PL
new file mode 100644
index 000000000000..8eb26ea4aba7
--- /dev/null
+++ b/x11-toolkits/p5-Tk/files/patch-pTk-Makefile.PL
@@ -0,0 +1,11 @@
+--- pTk/Makefile.PL.orig	Fri Jun 11 15:21:32 2004
++++ pTk/Makefile.PL	Fri Jun 11 15:21:57 2004
+@@ -12,7 +12,7 @@
+     'OBJECT'	=> '$(O_FILES)',
+     macro	=> { WINARCH     => $win_arch },
+     'DEFINE'	=> $define,
+-    'INC'	=> "$inc -I. -Ibitmaps",
++    'INC'	=> "$inc -I. -Ibitmaps -I%%LOCALBASE%%/include",
+     'SKIP'	=> [qw( distclean dist makeaperl xs_o)],
+     'clean'	=> {'FILES' => 'libpTk$(LIB_EXT)'}
+ );
diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist
index 5c7647cf89e5..cbd9b8903048 100644
--- a/x11-toolkits/p5-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tk/pkg-plist
@@ -51,8 +51,6 @@ bin/widget
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Dirlist.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/KDEDrop.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/KDESite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/LocalDrop.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Rect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunConst.pm
@@ -351,7 +349,6 @@ bin/widget
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/ks_names.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/mkVFunc
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/moredefs.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/patchlevel.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/port.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tclMath.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk/tcl.h