svn commit: r420881 - in head/textproc/highlight: . files
Koop Mast
kwm at FreeBSD.org
Thu Aug 25 20:46:12 UTC 2016
Author: kwm
Date: Thu Aug 25 20:46:10 2016
New Revision: 420881
URL: https://svnweb.freebsd.org/changeset/ports/420881
Log:
Backout the update to 3.31 and "update" to 2.29.
This is the last version that doesn't use to_string(). to_string() is a
c++11 function and gcc 4.8 on 9.3-RELEASE, used by compiler:c++11-lib,
doesn't provide this function.
Add small blob mentioning this.
Bump portepoch due to version going back.
Reported by: pkg-fallout@
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 Aug 25 20:16:21 2016 (r420880)
+++ head/textproc/highlight/Makefile Thu Aug 25 20:46:10 2016 (r420881)
@@ -1,9 +1,10 @@
# Created by: Adam Weinberger <adamw at FreeBSD.org>
# $FreeBSD$
+# 3.29+ needs to_string() which gcc48 (for 9.3-R) doesn't provide
PORTNAME= highlight
-PORTVERSION= 3.31
-PORTEPOCH= 2
+PORTVERSION= 3.29
+PORTEPOCH= 3
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
Modified: head/textproc/highlight/distinfo
==============================================================================
--- head/textproc/highlight/distinfo Thu Aug 25 20:16:21 2016 (r420880)
+++ head/textproc/highlight/distinfo Thu Aug 25 20:46:10 2016 (r420881)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471716553
-SHA256 (highlight-3.31.tar.bz2) = c78cdce3c8133736c3bc2f931d34cb69c09e043c9ce681251e26a9f9b19c4c6d
-SIZE (highlight-3.31.tar.bz2) = 628481
+TIMESTAMP = 1472157593
+SHA256 (highlight-3.29.tar.bz2) = 76cc769d98778985235c0b7d1345cff78c99f597b51edd4e9be7d3fc0160bf92
+SIZE (highlight-3.29.tar.bz2) = 670624
Modified: head/textproc/highlight/files/patch-src_makefile
==============================================================================
--- head/textproc/highlight/files/patch-src_makefile Thu Aug 25 20:16:21 2016 (r420880)
+++ head/textproc/highlight/files/patch-src_makefile Thu Aug 25 20:46:10 2016 (r420881)
@@ -1,15 +1,15 @@
---- src/makefile.orig 2016-08-20 21:01:57.961708000 +0200
-+++ src/makefile 2016-08-20 21:03:49.861494000 +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
--CXX=g++
-+CXX?=g++
+-CXX=c++
++CXX?=c++
- # was: qmake-qt5
- QMAKE=qmake
-@@ -38,10 +38,10 @@
+ # Added -qt4 because of Arch Linux Qt5 migration
+ QMAKE=qmake-qt4
+@@ -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
@@ -22,15 +22,7 @@
# luajit lib
# LUA_LIBS=$(shell pkg-config --libs luajit)
-@@ -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)
+@@ -67,7 +67,7 @@
#LDFLAGS = ${LDFLAGS} -s
#LDFLAGS= -Wl,--as-needed
@@ -39,9 +31,3 @@
# 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 Thu Aug 25 20:16:21 2016 (r420880)
+++ head/textproc/highlight/pkg-plist Thu Aug 25 20:46:10 2016 (r420881)
@@ -37,7 +37,6 @@ 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
@@ -200,7 +199,6 @@ 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
More information about the svn-ports-head
mailing list