From owner-svn-ports-all@FreeBSD.ORG Sun May 18 13:21:14 2014 Return-Path: Delivered-To: svn-ports-all@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 66D2CEF3; Sun, 18 May 2014 13:21:14 +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 50CC32973; Sun, 18 May 2014 13:21:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IDLEko094427; Sun, 18 May 2014 13:21:14 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IDLDTp094422; Sun, 18 May 2014 13:21:13 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201405181321.s4IDLDTp094422@svn.freebsd.org> From: Greg Lewis Date: Sun, 18 May 2014 13:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354419 - in head/x11-wm/afterstep-stable: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 13:21:14 -0000 Author: glewis Date: Sun May 18 13:21:12 2014 New Revision: 354419 URL: http://svnweb.freebsd.org/changeset/ports/354419 QAT: https://qat.redports.org/buildarchive/r354419/ Log: . Convert to staging (and remove NO_STAGE). . Fix the build on 8.x and 9.x by using a static libexecinfo link on them (not yet verified). . Remove USE_BZIP2 in favour of USES tar:bzip2 . Fix up some of the Perl script Perl executable usage. . Set HOME=- to prevent touching .afterstep in /root (suggested by swills@) . Fix additional packing list problems. Still need to fix LIB_DEPENDS format and the use of MAN1. Added: head/x11-wm/afterstep-stable/files/patch-tools-installastheme.pl.in (contents, props changed) head/x11-wm/afterstep-stable/files/patch-tools-makeastheme.pl.in (contents, props changed) Modified: head/x11-wm/afterstep-stable/Makefile head/x11-wm/afterstep-stable/files/patch-configure head/x11-wm/afterstep-stable/pkg-plist Modified: head/x11-wm/afterstep-stable/Makefile ============================================================================== --- head/x11-wm/afterstep-stable/Makefile Sun May 18 13:11:44 2014 (r354418) +++ head/x11-wm/afterstep-stable/Makefile Sun May 18 13:21:12 2014 (r354419) @@ -22,12 +22,13 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/db tiff:${PORTSDIR}/graphics/tiff RUN_DEPENDS= xli:${PORTSDIR}/graphics/xli -USE_BZIP2= yes -USES= gmake pkgconfig +USES= gmake pkgconfig shebangfix tar:bzip2 USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 librsvg2 pango USE_XORG+= ice sm x11 xcomposite xcursor xdamage xext xfixes xi xinerama \ xrandr xrender GNU_CONFIGURE= yes +SHEBANG_FILES= tools/ascommand.pl \ + tools/importasmenu MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+=--disable-ascp \ --enable-i18n \ @@ -37,6 +38,7 @@ CONFIGURE_ARGS+=--disable-ascp \ --with-jpeg-includes="${LOCALBASE}/include" \ --with-png-includes="${LOCALBASE}/include" \ --with-gif +MAKE_ENV+= HOME=- WRKSRC= ${WRKDIR}/${PORTNAME}-devel-${PORTVERSION} @@ -58,7 +60,6 @@ CONFIGURE_ARGS+= --enable-different-look CONFIGURE_ARGS+= --disable-savewindows .endif -NO_STAGE= yes .include .if exists(${PREFIX}/share/gnome/wm-properties) @@ -67,6 +68,12 @@ PLIST_SUB+= GNOME="" PLIST_SUB+= GNOME="@comment " .endif +.if ${OSVERSION} >= 1000000 +STATIC_LIBEXECINFO= +.else +STATIC_LIBEXECINFO= ${LOCALBASE}/lib/libexecinfo.a +.endif + post-extract: ${CP} ${FILESDIR}/monitor_bsd.xpm \ ${WRKSRC}/afterstep/desktop/icons/xml/monitor-bsd.xpm @@ -88,9 +95,12 @@ post-patch: @${REINPLACE_CMD} -e 's,ft_version,libafterstep_version,g' \ ${WRKSRC}/${f} .endfor -.for f in configure libAfterBase/configure libAfterConf/Makefile.in libAfterImage/configure +.for f in configure libAfterBase/configure libAfterConf/Makefile.in libAfterImage/configure tools/makeastheme.pl.in tools/installastheme.pl.in @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/${f} .endfor + @${REINPLACE_CMD} \ + -e 's,%%STATIC_LIBEXECINFO%%,${STATIC_LIBEXECINFO},g' \ + ${WRKSRC}/configure .include Modified: head/x11-wm/afterstep-stable/files/patch-configure ============================================================================== --- head/x11-wm/afterstep-stable/files/patch-configure Sun May 18 13:11:44 2014 (r354418) +++ head/x11-wm/afterstep-stable/files/patch-configure Sun May 18 13:21:12 2014 (r354419) @@ -2,6 +2,33 @@ $FreeBSD$ --- configure Sat Jun 24 21:55:24 2006 +++ configure.orig Sat Jun 24 21:54:41 2006 +@@ -7955,7 +7955,7 @@ + fi + + if test "x$enable_staticlibs" = "xyes"; then +- AFTERBASE_LIB="../../libAfterBase/libAfterBase.a" ++ AFTERBASE_LIB="../../libAfterBase/libAfterBase.a %%STATIC_LIBEXECINFO%%" + AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.a" + AFTERSTEP_LIB="../../libAfterStep/libAfterStep.a" + AFTERCONF_LIB="../../libAfterConf/libAfterConf.a" +@@ -7974,7 +7974,7 @@ + LIBPROG='$(LIB_SHARED_CYG)' + LIBINSTALL="install.cyg" + else +- AFTERBASE_LIB="../../libAfterBase/libAfterBase.so" ++ AFTERBASE_LIB="../../libAfterBase/libAfterBase.so %%STATIC_LIBEXECINFO%%" + AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.so" + AFTERSTEP_LIB="../../libAfterStep/libAfterStep.so" + AFTERCONF_LIB="../../libAfterConf/libAfterConf.so" +@@ -7985,7 +7985,7 @@ + fi + fi + +-AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a" ++AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a %%STATIC_LIBEXECINFO%%" + AFTERIMAGE_STATIC_LIB="../../libAfterImage/libAfterImage.a" + AFTERSTEP_STATIC_LIB="../../libAfterStep/libAfterStep.a" + AFTERCONF_STATIC_LIB="../../libAfterConf/libAfterConf.a" @@ -7660,7 +7660,7 @@ fi Added: head/x11-wm/afterstep-stable/files/patch-tools-installastheme.pl.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-tools-installastheme.pl.in Sun May 18 13:21:12 2014 (r354419) @@ -0,0 +1,8 @@ +--- tools/installastheme.pl.in.orig 2014-05-17 11:39:07.000000000 -0700 ++++ tools/installastheme.pl.in 2014-05-17 11:39:14.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!@PERL@ ++#!%%LOCALBASE%%/bin/perl + + use strict; + use Cwd; Added: head/x11-wm/afterstep-stable/files/patch-tools-makeastheme.pl.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep-stable/files/patch-tools-makeastheme.pl.in Sun May 18 13:21:12 2014 (r354419) @@ -0,0 +1,8 @@ +--- tools/makeastheme.pl.in.orig 2014-05-17 11:41:45.000000000 -0700 ++++ tools/makeastheme.pl.in 2014-05-17 11:41:52.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!@PERL@ ++#!%%LOCALBASE%%/usr/bin/perl + + use strict; + Modified: head/x11-wm/afterstep-stable/pkg-plist ============================================================================== --- head/x11-wm/afterstep-stable/pkg-plist Sun May 18 13:11:44 2014 (r354418) +++ head/x11-wm/afterstep-stable/pkg-plist Sun May 18 13:21:12 2014 (r354419) @@ -1377,7 +1377,7 @@ lib/libAfterStep.a %%DATADIR%%/wharf %%DATADIR%%/winlist %%DATADIR%%/wintabs -share/gnome/wm-properties/AfterStep.desktop +share/applications/AfterStep.desktop @dirrm %%DATADIR%%/themes @dirrm %%DATADIR%%/start/7_About_AfterStep @dirrm %%DATADIR%%/start/5_Quit @@ -1454,3 +1454,4 @@ share/gnome/wm-properties/AfterStep.desk @dirrm include/libAfterStep @dirrm include/libAfterConf @dirrm include/libASGTK +@dirrmtry share/applications