svn commit: r373225 - in head/x11-toolkits: p5-Tk p5-Tk-TableMatrix

[Mathieu Arnold]

Author: mat
Date: Mon Nov 24 17:05:20 2014
New Revision: 373225
URL: https://svnweb.freebsd.org/changeset/ports/373225
QAT: https://qat.redports.org/buildarchive/r373225/

Log:
  Remove SITE_ARCH/auto/Tk/pTk/extralibs.ld, it's empty, and conflicts.
  
  Sponsored by:	Absolight

Modified:
  head/x11-toolkits/p5-Tk-TableMatrix/Makefile
  head/x11-toolkits/p5-Tk/Makefile
  head/x11-toolkits/p5-Tk/pkg-plist

Modified: head/x11-toolkits/p5-Tk-TableMatrix/Makefile
==============================================================================
--- head/x11-toolkits/p5-Tk-TableMatrix/Makefile	Mon Nov 24 17:00:23 2014	(r373224)
+++ head/x11-toolkits/p5-Tk-TableMatrix/Makefile	Mon Nov 24 17:05:20 2014	(r373225)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Tk-TableMatrix
 PORTVERSION=	1.23
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -18,4 +18,9 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include
 
+# This would conflict with x11-toolkits/p5-Tk
+post-install:
+	@${RM} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/pTk/extralibs.ld
+	@${RMDIR} -p ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/pTk 2>/dev/null || :
+
 .include <bsd.port.mk>

Modified: head/x11-toolkits/p5-Tk/Makefile
==============================================================================
--- head/x11-toolkits/p5-Tk/Makefile	Mon Nov 24 17:00:23 2014	(r373224)
+++ head/x11-toolkits/p5-Tk/Makefile	Mon Nov 24 17:05:20 2014	(r373225)
@@ -3,6 +3,7 @@
 
 PORTNAME=	Tk
 PORTVERSION=	804.032
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -48,7 +49,7 @@ post-configure:
 		`${FIND} ${WRKSRC} -name Makefile`
 
 post-stage:
-	${FIND} ${STAGEDIR} -name '*.bs' -size 0c -exec ${RM} {} \;
+	@${RM} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/pTk/extralibs.ld
 	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Tk/Tk.so
 .for i in Canvas Compound Entry Event HList IO InputO JPEG Listbox Menubutton Mwm NBFrame PNG Pixmap Scale Scrollbar TList Text TixGrid WinPhoto X Xlib
 		${STRIP_CMD} \

Modified: head/x11-toolkits/p5-Tk/pkg-plist
==============================================================================
--- head/x11-toolkits/p5-Tk/pkg-plist	Mon Nov 24 17:00:23 2014	(r373224)
+++ head/x11-toolkits/p5-Tk/pkg-plist	Mon Nov 24 17:05:20 2014	(r373225)
@@ -740,7 +740,6 @@ bin/widget
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/getPrevFocus.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/interps.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/lsearch.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/pTk/extralibs.ld
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/tabFocus.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/updateWidgets.al
 man/man1/ptked.1.gz