From owner-svn-ports-head@FreeBSD.ORG Tue Jan 13 19:16:00 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5B434F8; Tue, 13 Jan 2015 19:16:00 +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 D10C2D9D; Tue, 13 Jan 2015 19:16:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0DJG0Wd071358; Tue, 13 Jan 2015 19:16:00 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0DJG0nM071347; Tue, 13 Jan 2015 19:16:00 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201501131916.t0DJG0nM071347@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 13 Jan 2015 19:16:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376982 - head/x11/x3270 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.18-1 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: Tue, 13 Jan 2015 19:16:01 -0000 Author: madpilot Date: Tue Jan 13 19:15:59 2015 New Revision: 376982 URL: https://svnweb.freebsd.org/changeset/ports/376982 QAT: https://qat.redports.org/buildarchive/r376982/ Log: - Update to 3.3.15ga7 - Move fonts to own directory - Modernize plist While here, silence one portlint warning. PR: 196101 Submitted by: ecrist at secure-computing.net (maintainer) Modified: head/x11/x3270/Makefile head/x11/x3270/distinfo head/x11/x3270/pkg-plist Modified: head/x11/x3270/Makefile ============================================================================== --- head/x11/x3270/Makefile Tue Jan 13 19:06:06 2015 (r376981) +++ head/x11/x3270/Makefile Tue Jan 13 19:15:59 2015 (r376982) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= x3270 -PORTVERSION= 3.3.13 +PORTVERSION= 3.3.15 CATEGORIES= x11 net MASTER_SITES= http://x3270.bgp.nu/download/current/ EXTRACT_SUFX= ga7-src.tgz @@ -10,17 +10,18 @@ EXTRACT_SUFX= ga7-src.tgz MAINTAINER= ecrist@secure-computing.net COMMENT= 3270 Terminal emulator -# Conflict due to x3270if -CONFLICTS= c3270-* - BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +# Conflict due to x3270if +CONFLICTS= c3270-* + USES= iconv imake:env USE_XORG= ice sm x11 xaw xext xmu xt GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs +CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/${PORTNAME} \ + --disable-dbcs CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if defined(WITHOUT_OPENSSL) Modified: head/x11/x3270/distinfo ============================================================================== --- head/x11/x3270/distinfo Tue Jan 13 19:06:06 2015 (r376981) +++ head/x11/x3270/distinfo Tue Jan 13 19:15:59 2015 (r376982) @@ -1,2 +1,2 @@ -SHA256 (x3270-3.3.13ga7-src.tgz) = a8c6bc9d410e9aa837a2a427f978597fdba135abef0e300cc4531aed6ca45a94 -SIZE (x3270-3.3.13ga7-src.tgz) = 1354917 +SHA256 (x3270-3.3.15ga7-src.tgz) = 0914f5c360faf72eb5a5a764ddcbaf0ba4b195d1c166a65a057126f5f7b945c9 +SIZE (x3270-3.3.15ga7-src.tgz) = 1367615 Modified: head/x11/x3270/pkg-plist ============================================================================== --- head/x11/x3270/pkg-plist Tue Jan 13 19:06:06 2015 (r376981) +++ head/x11/x3270/pkg-plist Tue Jan 13 19:15:59 2015 (r376982) @@ -1,31 +1,25 @@ bin/x3270 bin/x3270if etc/x3270/ibm_hosts -lib/X11/fonts/local/3270-12.pcf.gz -lib/X11/fonts/local/3270-12b.pcf.gz -lib/X11/fonts/local/3270-20.pcf.gz -lib/X11/fonts/local/3270-20b.pcf.gz -lib/X11/fonts/local/3270.pcf.gz -lib/X11/fonts/local/3270b.pcf.gz -lib/X11/fonts/local/3270gr.pcf.gz -lib/X11/fonts/local/3270gt12.pcf.gz -lib/X11/fonts/local/3270gt12b.pcf.gz -lib/X11/fonts/local/3270gt16.pcf.gz -lib/X11/fonts/local/3270gt16b.pcf.gz -lib/X11/fonts/local/3270gt24.pcf.gz -lib/X11/fonts/local/3270gt24b.pcf.gz -lib/X11/fonts/local/3270gt32.pcf.gz -lib/X11/fonts/local/3270gt32b.pcf.gz -lib/X11/fonts/local/3270gt8.pcf.gz -lib/X11/fonts/local/3270h.pcf.gz +lib/X11/fonts/x3270/3270-12.pcf.gz +lib/X11/fonts/x3270/3270-12b.pcf.gz +lib/X11/fonts/x3270/3270-20.pcf.gz +lib/X11/fonts/x3270/3270-20b.pcf.gz +lib/X11/fonts/x3270/3270.pcf.gz +lib/X11/fonts/x3270/3270b.pcf.gz +lib/X11/fonts/x3270/3270gr.pcf.gz +lib/X11/fonts/x3270/3270gt12.pcf.gz +lib/X11/fonts/x3270/3270gt12b.pcf.gz +lib/X11/fonts/x3270/3270gt16.pcf.gz +lib/X11/fonts/x3270/3270gt16b.pcf.gz +lib/X11/fonts/x3270/3270gt24.pcf.gz +lib/X11/fonts/x3270/3270gt24b.pcf.gz +lib/X11/fonts/x3270/3270gt32.pcf.gz +lib/X11/fonts/x3270/3270gt32b.pcf.gz +lib/X11/fonts/x3270/3270gt8.pcf.gz +lib/X11/fonts/x3270/3270h.pcf.gz man/man1/x3270-script.man.gz man/man1/x3270.man.gz man/man1/x3270if.man.gz man/man5/ibm_hosts.man.gz -@exec /bin/chmod u+w %D/lib/X11/fonts/local %D/lib/X11/fonts/local/fonts.dir -@exec %D/bin/mkfontdir %D/lib/X11/fonts/local -@exec /bin/chmod u=rwx,go=rx %D/lib/X11/fonts/local -@exec /bin/chmod a=r %D/lib/X11/fonts/local/fonts.dir -@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local -@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi -@dirrm etc/x3270 +@fontsdir lib/X11/fonts/x3270