From owner-svn-ports-all@freebsd.org Thu Jul 2 14:57:13 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF993992543; Thu, 2 Jul 2015 14:57:13 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.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 B012320A0; Thu, 2 Jul 2015 14:57:13 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t62EvDV5093801; Thu, 2 Jul 2015 14:57:13 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t62EvC8w093796; Thu, 2 Jul 2015 14:57:12 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201507021457.t62EvC8w093796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Thu, 2 Jul 2015 14:57:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391162 - in head/textproc/highlight: . 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.20 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: Thu, 02 Jul 2015 14:57:13 -0000 Author: kwm Date: Thu Jul 2 14:57:12 2015 New Revision: 391162 URL: https://svnweb.freebsd.org/changeset/ports/391162 Log: Update highlight to 3.22. Add dos2unix USES for ^M fun. Modified: head/textproc/highlight/Makefile head/textproc/highlight/distinfo head/textproc/highlight/files/patch-src_makefile head/textproc/highlight/pkg-plist Modified: head/textproc/highlight/Makefile ============================================================================== --- head/textproc/highlight/Makefile Thu Jul 2 14:46:40 2015 (r391161) +++ head/textproc/highlight/Makefile Thu Jul 2 14:57:12 2015 (r391162) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= highlight -PORTVERSION= 3.18 +PORTVERSION= 3.22 PORTEPOCH= 2 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ @@ -12,7 +12,7 @@ COMMENT= Customizable syntax highlighter BUILD_DEPENDS= boost-libs>0:${PORTSDIR}/devel/boost-libs -USES= gmake lua:52 pkgconfig tar:bzip2 +USES= dos2unix gmake lua:52 pkgconfig tar:bzip2 MAKEFILE= makefile MAKE_ARGS= CXX="${CXX}" \ CFLAGS="${CXXFLAGS} ${CPPFLAGS} -DHAVE_DECL_GETOPT" \ Modified: head/textproc/highlight/distinfo ============================================================================== --- head/textproc/highlight/distinfo Thu Jul 2 14:46:40 2015 (r391161) +++ head/textproc/highlight/distinfo Thu Jul 2 14:57:12 2015 (r391162) @@ -1,2 +1,2 @@ -SHA256 (highlight-3.18.tar.bz2) = 55c6f7a5aeaac2c811078a0215b27c1c80d971bba5dff51ee74a97b3303a584b -SIZE (highlight-3.18.tar.bz2) = 619669 +SHA256 (highlight-3.22.tar.bz2) = 4776ce4305e6f92d8a9faf5d0aeffd56f413ad57e55303e7a2a6357387ec056f +SIZE (highlight-3.22.tar.bz2) = 624023 Modified: head/textproc/highlight/files/patch-src_makefile ============================================================================== --- head/textproc/highlight/files/patch-src_makefile Thu Jul 2 14:46:40 2015 (r391161) +++ head/textproc/highlight/files/patch-src_makefile Thu Jul 2 14:57:12 2015 (r391162) @@ -1,5 +1,5 @@ ---- src/makefile.orig 2014-04-04 19:26:25.000000000 +0200 -+++ src/makefile 2014-04-29 16:12:06.000000000 +0200 +--- src/makefile.orig 2015-07-02 16:51:26.582456000 +0200 ++++ src/makefile 2015-07-02 16:51:53.706070000 +0200 @@ -12,7 +12,7 @@ # See src/gui-qt/highlight.pro for the Qt GUI compilation options @@ -9,17 +9,12 @@ # Added -qt4 because of Arch Linux Qt5 migration QMAKE=qmake-qt4 -@@ -33,15 +33,14 @@ - # Include path - INCLUDE_DIR=./include/ - -- - # If Lua 5.2 is not default on your system yet you have to: - # - remove -DUSE_LUA52 - # - use lua5.1 in the pkg-config calls +@@ -37,10 +37,10 @@ + # If Lua 5.2 is not default on your system yet you have to + # use lua5.1 in the pkg-config calls --LUA_CFLAGS=$(shell pkg-config --cflags lua) -DUSE_LUA52 -+LUA_CFLAGS=$(shell pkg-config --cflags lua-5.2) -DUSE_LUA52 +-LUA_CFLAGS=$(shell pkg-config --cflags lua) ++LUA_CFLAGS=$(shell pkg-config --cflags lua-5.2) # default lua lib -LUA_LIBS=$(shell pkg-config --libs lua) @@ -27,7 +22,7 @@ # luajit lib # LUA_LIBS=$(shell pkg-config --libs luajit) -@@ -68,7 +67,7 @@ +@@ -67,7 +67,7 @@ #LDFLAGS = ${LDFLAGS} -s #LDFLAGS= -Wl,--as-needed Modified: head/textproc/highlight/pkg-plist ============================================================================== --- head/textproc/highlight/pkg-plist Thu Jul 2 14:46:40 2015 (r391161) +++ head/textproc/highlight/pkg-plist Thu Jul 2 14:57:12 2015 (r391162) @@ -86,6 +86,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/js.lang %%DATADIR%%/langDefs/jsp.lang %%DATADIR%%/langDefs/ldif.lang +%%DATADIR%%/langDefs/less.lang %%DATADIR%%/langDefs/lhs.lang %%DATADIR%%/langDefs/lilypond.lang %%DATADIR%%/langDefs/limbo.lang @@ -145,6 +146,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/python.lang %%DATADIR%%/langDefs/q.lang %%DATADIR%%/langDefs/qmake.lang +%%DATADIR%%/langDefs/qml.lang %%DATADIR%%/langDefs/qu.lang %%DATADIR%%/langDefs/r.lang %%DATADIR%%/langDefs/rebol.lang @@ -157,6 +159,7 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/sas.lang %%DATADIR%%/langDefs/scala.lang %%DATADIR%%/langDefs/scilab.lang +%%DATADIR%%/langDefs/scss.lang %%DATADIR%%/langDefs/sh.lang %%DATADIR%%/langDefs/small.lang %%DATADIR%%/langDefs/smalltalk.lang @@ -167,6 +170,8 @@ man/man1/highlight.1.gz %%DATADIR%%/langDefs/spn.lang %%DATADIR%%/langDefs/sql.lang %%DATADIR%%/langDefs/squirrel.lang +%%DATADIR%%/langDefs/styl.lang +%%DATADIR%%/langDefs/swift.lang %%DATADIR%%/langDefs/sybase.lang %%DATADIR%%/langDefs/tcl.lang %%DATADIR%%/langDefs/tcsh.lang