From owner-svn-ports-head@FreeBSD.ORG Sun Apr 27 18:55:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5321D22A; Sun, 27 Apr 2014 18:55:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24D7E159D; Sun, 27 Apr 2014 18:55:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3RItUE1089263; Sun, 27 Apr 2014 18:55:30 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3RItTUl089260; Sun, 27 Apr 2014 18:55:29 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201404271855.s3RItTUl089260@svn.freebsd.org> From: John Marino Date: Sun, 27 Apr 2014 18:55:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352448 - head/x11-toolkits/p5-Alien-wxWidgets X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Apr 2014 18:55:30 -0000 Author: marino Date: Sun Apr 27 18:55:29 2014 New Revision: 352448 URL: http://svnweb.freebsd.org/changeset/ports/352448 QAT: https://qat.redports.org/buildarchive/r352448/ Log: x11-toolkits/p5-Alien-wxWidgets: Unbreak on some platforms For me, the most cringeworthy makefile technique is the shell command (!=) evaluating another port with "make -C". This is very slow, fragile, and can cause a huge mess if something is out of wack. The technique was used in this port and it didn't even work on all platforms. For sure FreeBSD 8 (according to portsmon) and DragonFly were broken. Essentially the file "gtk2_3_0_0_uni_gcc_3.4.pm" was installed, but the broken plist substitution was looking for "gtk2__uni_gcc_3.4.pm". To fix this robustly, get rid of the whole "make -C" mess and the plist substituion and just use the find command to dynamically add this one file to the plist. Since it starts with a unique pattern, we really don't need to know the Wx version in order to establish the plist with this technique. Approved by: blanket Modified: head/x11-toolkits/p5-Alien-wxWidgets/Makefile head/x11-toolkits/p5-Alien-wxWidgets/pkg-plist Modified: head/x11-toolkits/p5-Alien-wxWidgets/Makefile ============================================================================== --- head/x11-toolkits/p5-Alien-wxWidgets/Makefile Sun Apr 27 18:42:50 2014 (r352447) +++ head/x11-toolkits/p5-Alien-wxWidgets/Makefile Sun Apr 27 18:55:29 2014 (r352448) @@ -16,15 +16,16 @@ USE_PERL5= modbuild USE_WX= 3.0 WX_COMPS= wx WX_UNICODE= yes -WX_UNI= uni_ CONFIGURE_ARGS+= --wxWidgets-build=0 --wxWidgets-unicode=1 -WX_UVER!= ${MAKE} -C ${.CURDIR}/../../x11-toolkits/wxgtk30 -V'$${PORTVERSION:C/\./_/g}' -PLIST_SUB+= WX_UVER=${WX_UVER} WX_UNI=${WX_UNI} - post-patch: @${REINPLACE_CMD} -e 's/wx-config/${WX_CONFIG:T}/' ${WRKSRC}/Build.PL @${REINPLACE_CMD} -e "s/\'wx-config/\'${WX_CONFIG:T}/" -e "s/lc_r/lpthread/" \ ${WRKSRC}/inc/My/Build/Any_wx_config.pm +post-install: + # file name is function of wx version, add it dynamically + @(cd ${STAGEDIR}${PREFIX}; ${FIND} * -type f -name gtk2_\* -print \ + >> ${TMPPLIST}) + .include Modified: head/x11-toolkits/p5-Alien-wxWidgets/pkg-plist ============================================================================== --- head/x11-toolkits/p5-Alien-wxWidgets/pkg-plist Sun Apr 27 18:42:50 2014 (r352447) +++ head/x11-toolkits/p5-Alien-wxWidgets/pkg-plist Sun Apr 27 18:55:29 2014 (r352448) @@ -1,7 +1,6 @@ %%PERL5_MAN3%%/Alien::wxWidgets.3.gz %%PERL5_MAN3%%/Alien::wxWidgets::Utility.3.gz %%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets/Utility.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets/Config/gtk2_%%WX_UVER%%_%%WX_UNI%%gcc_3_4.pm %%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets.pm @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets/Config @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Alien/wxWidgets