Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Aug 2016 19:07:44 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420526 - in head/textproc/highlight: . files
Message-ID:  <201608201907.u7KJ7i4S094339@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Sat Aug 20 19:07:44 2016
New Revision: 420526
URL: https://svnweb.freebsd.org/changeset/ports/420526

Log:
  Update highlight to 3.31.
  
  Strip binary.

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	Sat Aug 20 18:44:38 2016	(r420525)
+++ head/textproc/highlight/Makefile	Sat Aug 20 19:07:44 2016	(r420526)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	highlight
-PORTVERSION=	3.28
+PORTVERSION=	3.31
 PORTEPOCH=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.andre-simon.de/zip/
@@ -32,5 +32,6 @@ post-patch:
 post-install:
 	@cd ${STAGEDIR}${PREFIX}/etc/highlight && ${MV} filetypes.conf \
 		filetypes.conf.sample
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/highlight
 
 .include <bsd.port.mk>

Modified: head/textproc/highlight/distinfo
==============================================================================
--- head/textproc/highlight/distinfo	Sat Aug 20 18:44:38 2016	(r420525)
+++ head/textproc/highlight/distinfo	Sat Aug 20 19:07:44 2016	(r420526)
@@ -1,2 +1,3 @@
-SHA256 (highlight-3.28.tar.bz2) = 36364b6d906148dac04426a0c892fe2343e5e2c752316666589f8dff741ce7cd
-SIZE (highlight-3.28.tar.bz2) = 622161
+TIMESTAMP = 1471716553
+SHA256 (highlight-3.31.tar.bz2) = c78cdce3c8133736c3bc2f931d34cb69c09e043c9ce681251e26a9f9b19c4c6d
+SIZE (highlight-3.31.tar.bz2) = 628481

Modified: head/textproc/highlight/files/patch-src_makefile
==============================================================================
--- head/textproc/highlight/files/patch-src_makefile	Sat Aug 20 18:44:38 2016	(r420525)
+++ head/textproc/highlight/files/patch-src_makefile	Sat Aug 20 19:07:44 2016	(r420526)
@@ -1,15 +1,15 @@
---- src/makefile.orig	2015-07-02 16:51:26.582456000 +0200
-+++ src/makefile	2015-07-02 16:51:53.706070000 +0200
+--- src/makefile.orig	2016-08-20 21:01:57.961708000 +0200
++++ src/makefile	2016-08-20 21:03:49.861494000 +0200
 @@ -12,7 +12,7 @@
  
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
  
--CXX=c++
-+CXX?=c++
+-CXX=g++
++CXX?=g++
  
- # Added -qt4 because of Arch Linux Qt5 migration
- QMAKE=qmake-qt4
-@@ -37,10 +37,10 @@
+ # was: qmake-qt5
+ QMAKE=qmake
+@@ -38,10 +38,10 @@
  # If Lua 5.2 is not default on your system yet you have to
  # use lua5.1 in the pkg-config calls
  
@@ -22,12 +22,26 @@
  
  # luajit lib
  # LUA_LIBS=$(shell pkg-config --libs luajit)
-@@ -67,7 +67,7 @@
+@@ -65,19 +65,19 @@
+ 	CFLAGS+=-fPIC
+ endif
+ 
+-LDFLAGS = -ldl
++LDFLAGS = #-ldl
+ # Do not strip by default (Mac OS X lazy pointer issues)
+ # Add -static to avoid linking with shared libs (can cause trouble when highlight
+ # is run as service)
  #LDFLAGS = ${LDFLAGS} -s
  #LDFLAGS= -Wl,--as-needed
  
 -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
-+CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} -I%%LOCALBASE%%/include ${LUA_CFLAGS}
++CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} -I/usr/local/include ${LUA_CFLAGS}
  
  # Data directories (data dir, configuration file dir)
  CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
+ 
+-AR=ar
++AR?=ar
+ ARFLAGS=-crs
+ 
+ # objects files to build the library

Modified: head/textproc/highlight/pkg-plist
==============================================================================
--- head/textproc/highlight/pkg-plist	Sat Aug 20 18:44:38 2016	(r420525)
+++ head/textproc/highlight/pkg-plist	Sat Aug 20 19:07:44 2016	(r420526)
@@ -37,6 +37,7 @@ man/man1/highlight.1.gz
 %%DATADIR%%/langDefs/ceylon.lang
 %%DATADIR%%/langDefs/charmm.lang
 %%DATADIR%%/langDefs/chill.lang
+%%DATADIR%%/langDefs/chpl.lang
 %%DATADIR%%/langDefs/clean.lang
 %%DATADIR%%/langDefs/clearbasic.lang
 %%DATADIR%%/langDefs/clipper.lang
@@ -199,6 +200,7 @@ man/man1/highlight.1.gz
 %%DATADIR%%/langDefs/xml.lang
 %%DATADIR%%/langDefs/xpp.lang
 %%DATADIR%%/langDefs/yaiff.lang
+%%DATADIR%%/langDefs/yaml.lang
 %%DATADIR%%/langDefs/yang.lang
 %%DATADIR%%/langDefs/znn.lang
 %%DATADIR%%/plugins/asciidoc_html_add_links.lua



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608201907.u7KJ7i4S094339>