- update highlight to 3.2

- update plist
- update patches
- add BUILD_DEPENDS and LIB_DEPENDS

ok ajacoutot@
This commit is contained in:
benoit 2011-04-03 07:45:23 +00:00
parent c37a0a8a83
commit fe3fda9f56
5 changed files with 174 additions and 119 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2010/11/20 19:56:48 espie Exp $
# $OpenBSD: Makefile,v 1.10 2011/04/03 07:45:23 benoit Exp $
COMMENT = convert source code to markup formats
DISTNAME = highlight-2.16
DISTNAME = highlight-3.2
CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m stdc++
WANTLIB = c m stdc++ lua
MASTER_SITES = ${HOMEPAGE}/zip/
EXTRACT_SUFX = .tar.bz2
@ -23,8 +23,12 @@ EXTRACT_SUFX = .tar.bz2
USE_GMAKE = Yes
USE_GROFF = Yes
BUILD_DEPENDS = devel/boost
LIB_DEPENDS = lang/lua
MAKE_FILE = makefile
MAKE_FLAGS = CXX=${CXX}
MAKE_FLAGS = CXX=${CXX} \
LDFLAGS="-L${LOCALBASE}/lib"
NO_REGRESS = Yes
@ -34,7 +38,8 @@ post-extract:
gunzip ${WRKSRC}/man/highlight.1.gz
do-configure:
${SUBST_CMD} ${WRKSRC}/makefile ${WRKSRC}/man/highlight.1
${SUBST_CMD} ${WRKSRC}/makefile ${WRKSRC}/man/highlight.1 \
${WRKSRC}/src/makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/highlight ${PREFIX}/bin

View File

@ -1,5 +1,5 @@
MD5 (highlight-2.16.tar.bz2) = CPFCmm2yWKsafuy7Tg1Esg==
RMD160 (highlight-2.16.tar.bz2) = 9092ZU2B8jKyse/o989Pt3w2Dq8=
SHA1 (highlight-2.16.tar.bz2) = tf7RS7Gpc/4TTdITN2a7hv3HSU4=
SHA256 (highlight-2.16.tar.bz2) = zFCndc/UHeJwFOot+7lcP6rJXPtJte3KkIwbI5q/CzY=
SIZE (highlight-2.16.tar.bz2) = 549442
MD5 (highlight-3.2.tar.bz2) = 64alpmZNw4usRcZuIu2HHA==
RMD160 (highlight-3.2.tar.bz2) = LnE5YEtYgnO9lLD8Zk6ba6vM2CU=
SHA1 (highlight-3.2.tar.bz2) = 77+5aLjBUyup5qxTNqRPjsVxoOI=
SHA256 (highlight-3.2.tar.bz2) = 53HtFvlBF3QtEWDD36h0Q+Mdr952E6+bnp4yPhdfGAY=
SIZE (highlight-3.2.tar.bz2) = 729940

View File

@ -1,19 +1,19 @@
$OpenBSD: patch-man_highlight_1,v 1.4 2009/10/14 15:04:06 giovanni Exp $
--- man/highlight.1.orig Wed Sep 2 22:25:25 2009
+++ man/highlight.1 Wed Oct 14 16:03:37 2009
@@ -209,15 +209,15 @@ Reformatting code will only work with C, C++, C# and J
$OpenBSD: patch-man_highlight_1,v 1.5 2011/04/03 07:45:26 benoit Exp $
--- man/highlight.1.orig Tue Aug 24 19:26:07 2010
+++ man/highlight.1 Sat Oct 9 16:32:10 2010
@@ -184,15 +184,15 @@
The wrapping options might cause faulty highlighting of multi line comments.
.SH FILES
The parsing information of the programming languages is stored in
-.I /usr/share/highlight/langDefs/.
+.I ${PREFIX}/share/highlight/langDefs/.
+.I ${PREFIX}/highlight/langDefs/.
You may enhance
.B highlight's
parsing capabilities by adding more *.lang - files to this directory.
You can also define other directories with -D, or add search paths with -E.
You can also define other directories with --data-dir.
Documentation files are stored in
-.I /usr/share/doc/highlight/
+.I ${PREFIX}/share/doc/highlight/
+.I ${PREFIX}/doc/highlight/
, configuration files in
-.I /etc/highlight/.
+.I ${SYSCONFDIR}/highlight/.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_makefile,v 1.5 2010/07/25 15:06:53 benoit Exp $
--- src/makefile.orig Mon Dec 28 21:09:43 2009
+++ src/makefile Wed Jan 20 11:32:34 2010
@@ -15,11 +15,11 @@
$OpenBSD: patch-src_makefile,v 1.6 2011/04/03 07:45:26 benoit Exp $
--- src/makefile.orig Wed Nov 10 22:48:12 2010
+++ src/makefile Sun Nov 21 16:21:16 2010
@@ -12,11 +12,11 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@ -10,8 +10,17 @@ $OpenBSD: patch-src_makefile,v 1.5 2010/07/25 15:06:53 benoit Exp $
QMAKE=qmake
-CFLAGS:=-O2 ${CFLAGS}
+#CFLAGS:=-O2 ${CFLAGS}
#CFLAGS:=-ggdb ${CFLAGS}
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
#CFLAGS:=-ggdb ${CFLAGS} -DNDEBUG
CFLAGS_DILU=-fno-strict-aliasing
@@ -32,7 +32,7 @@
INCLUDE_DIR=./include/
# Ubuntu path:
-LUA_INCLUDE_DIR=/usr/include/lua5.1
+LUA_INCLUDE_DIR=${LOCALBASE}/include
LUA_LIB_NAME=lua
#LUA_LIB_NAME=lua5.1
SO_VERSION=2.13

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2010/07/25 15:06:55 benoit Exp $
@comment $OpenBSD: PLIST,v 1.6 2011/04/03 07:45:28 benoit Exp $
@bin bin/highlight
@man man/man1/highlight.1
share/doc/highlight/
@ -9,118 +9,119 @@ share/examples/highlight/filetypes.conf
@sample ${SYSCONFDIR}/highlight/filetypes.conf
share/highlight/
share/highlight/langDefs/
share/highlight/langDefs/4gl.lang
share/highlight/langDefs/a4c.lang
share/highlight/langDefs/abap4.lang
share/highlight/langDefs/abnf.lang
share/highlight/langDefs/abp.lang
share/highlight/langDefs/actionscript.lang
share/highlight/langDefs/ada.lang
share/highlight/langDefs/agda.lang
share/highlight/langDefs/ahk.lang
share/highlight/langDefs/ampl.lang
share/highlight/langDefs/amtrix.lang
share/highlight/langDefs/applescript.lang
share/highlight/langDefs/arc.lang
share/highlight/langDefs/arm.lang
share/highlight/langDefs/as.lang
share/highlight/langDefs/asm.lang
share/highlight/langDefs/ascend.lang
share/highlight/langDefs/asp.lang
share/highlight/langDefs/aspect.lang
share/highlight/langDefs/assembler.lang
share/highlight/langDefs/ats.lang
share/highlight/langDefs/au3.lang
share/highlight/langDefs/autohotkey.lang
share/highlight/langDefs/autoit.lang
share/highlight/langDefs/avenue.lang
share/highlight/langDefs/awk.lang
share/highlight/langDefs/bat.lang
share/highlight/langDefs/bb.lang
share/highlight/langDefs/bbcode.lang
share/highlight/langDefs/bib.lang
share/highlight/langDefs/bibtex.lang
share/highlight/langDefs/bison.lang
share/highlight/langDefs/blitzbasic.lang
share/highlight/langDefs/bms.lang
share/highlight/langDefs/bnf.lang
share/highlight/langDefs/boo.lang
share/highlight/langDefs/c.lang
share/highlight/langDefs/cb.lang
share/highlight/langDefs/cfc.lang
share/highlight/langDefs/chl.lang
share/highlight/langDefs/chill.lang
share/highlight/langDefs/clean.lang
share/highlight/langDefs/clearbasic.lang
share/highlight/langDefs/clipper.lang
share/highlight/langDefs/clojure.lang
share/highlight/langDefs/clp.lang
share/highlight/langDefs/cob.lang
share/highlight/langDefs/cs.lang
share/highlight/langDefs/cobol.lang
share/highlight/langDefs/coldfusion.lang
share/highlight/langDefs/csharp.lang
share/highlight/langDefs/css.lang
share/highlight/langDefs/d.lang
share/highlight/langDefs/diff.lang
share/highlight/langDefs/dot.lang
share/highlight/langDefs/dylan.lang
share/highlight/langDefs/e.lang
share/highlight/langDefs/ebnf.lang
share/highlight/langDefs/erl.lang
share/highlight/langDefs/eiffel.lang
share/highlight/langDefs/erlang.lang
share/highlight/langDefs/euphoria.lang
share/highlight/langDefs/exp.lang
share/highlight/langDefs/f77.lang
share/highlight/langDefs/f90.lang
share/highlight/langDefs/flx.lang
share/highlight/langDefs/express.lang
share/highlight/langDefs/fame.lang
share/highlight/langDefs/felix.lang
share/highlight/langDefs/fortran77.lang
share/highlight/langDefs/fortran90.lang
share/highlight/langDefs/frink.lang
share/highlight/langDefs/fs.lang
share/highlight/langDefs/fsharp.lang
share/highlight/langDefs/go.lang
share/highlight/langDefs/graphviz.lang
share/highlight/langDefs/haskell.lang
share/highlight/langDefs/haxe.lang
share/highlight/langDefs/hcl.lang
share/highlight/langDefs/html.lang
share/highlight/langDefs/httpd.lang
share/highlight/langDefs/hx.lang
share/highlight/langDefs/icl.lang
share/highlight/langDefs/icn.lang
share/highlight/langDefs/icon.lang
share/highlight/langDefs/idl.lang
share/highlight/langDefs/idlang.lang
share/highlight/langDefs/ili.lang
share/highlight/langDefs/inc_luatex.lang
share/highlight/langDefs/informix.lang
share/highlight/langDefs/ini.lang
share/highlight/langDefs/inp.lang
share/highlight/langDefs/innosetup.lang
share/highlight/langDefs/interlis.lang
share/highlight/langDefs/io.lang
share/highlight/langDefs/iss.lang
share/highlight/langDefs/j.lang
share/highlight/langDefs/jasmin.lang
share/highlight/langDefs/java.lang
share/highlight/langDefs/js.lang
share/highlight/langDefs/jsp.lang
share/highlight/langDefs/lbn.lang
share/highlight/langDefs/ldif.lang
share/highlight/langDefs/lgt.lang
share/highlight/langDefs/lhs.lang
share/highlight/langDefs/lilypond.lang
share/highlight/langDefs/lindenscript.lang
share/highlight/langDefs/lisp.lang
share/highlight/langDefs/logtalk.lang
share/highlight/langDefs/lotos.lang
share/highlight/langDefs/ls.lang
share/highlight/langDefs/lsl.lang
share/highlight/langDefs/lotus.lang
share/highlight/langDefs/lua.lang
share/highlight/langDefs/ly.lang
share/highlight/langDefs/m.lang
share/highlight/langDefs/luban.lang
share/highlight/langDefs/make.lang
share/highlight/langDefs/mel.lang
share/highlight/langDefs/maple.lang
share/highlight/langDefs/matlab.lang
share/highlight/langDefs/maya.lang
share/highlight/langDefs/mercury.lang
share/highlight/langDefs/mib.lang
share/highlight/langDefs/miranda.lang
share/highlight/langDefs/ml.lang
share/highlight/langDefs/mo.lang
share/highlight/langDefs/mod2.lang
share/highlight/langDefs/mod3.lang
share/highlight/langDefs/mpl.lang
share/highlight/langDefs/modelica.lang
share/highlight/langDefs/ms.lang
share/highlight/langDefs/mssql.lang
share/highlight/langDefs/n.lang
share/highlight/langDefs/nas.lang
share/highlight/langDefs/mxml.lang
share/highlight/langDefs/nasal.lang
share/highlight/langDefs/nbc.lang
share/highlight/langDefs/nemerle.lang
share/highlight/langDefs/netrexx.lang
share/highlight/langDefs/nice.lang
share/highlight/langDefs/nrx.lang
share/highlight/langDefs/nsi.lang
share/highlight/langDefs/nut.lang
share/highlight/langDefs/nsis.lang
share/highlight/langDefs/nxc.lang
share/highlight/langDefs/oberon.lang
share/highlight/langDefs/objc.lang
share/highlight/langDefs/ocaml.lang
share/highlight/langDefs/octave.lang
share/highlight/langDefs/oorexx.lang
share/highlight/langDefs/os.lang
share/highlight/langDefs/oz.lang
share/highlight/langDefs/paradox.lang
share/highlight/langDefs/pas.lang
share/highlight/langDefs/perl.lang
share/highlight/langDefs/php.lang
share/highlight/langDefs/pike.lang
share/highlight/langDefs/pl.lang
share/highlight/langDefs/pl1.lang
share/highlight/langDefs/pov.lang
share/highlight/langDefs/pro.lang
@ -129,29 +130,30 @@ share/highlight/langDefs/ps.lang
share/highlight/langDefs/ps1.lang
share/highlight/langDefs/psl.lang
share/highlight/langDefs/pure.lang
share/highlight/langDefs/py.lang
share/highlight/langDefs/pyx.lang
share/highlight/langDefs/pyrex.lang
share/highlight/langDefs/python.lang
share/highlight/langDefs/q.lang
share/highlight/langDefs/qmake.lang
share/highlight/langDefs/qu.lang
share/highlight/langDefs/r.lang
share/highlight/langDefs/rb.lang
share/highlight/langDefs/rebol.lang
share/highlight/langDefs/rexx.lang
share/highlight/langDefs/rnc.lang
share/highlight/langDefs/ruby.lang
share/highlight/langDefs/s.lang
share/highlight/langDefs/sas.lang
share/highlight/langDefs/sc.lang
share/highlight/langDefs/scala.lang
share/highlight/langDefs/scilab.lang
share/highlight/langDefs/sh.lang
share/highlight/langDefs/sma.lang
share/highlight/langDefs/small.lang
share/highlight/langDefs/smalltalk.lang
share/highlight/langDefs/sml.lang
share/highlight/langDefs/sno.lang
share/highlight/langDefs/snmp.lang
share/highlight/langDefs/snobol.lang
share/highlight/langDefs/spec.lang
share/highlight/langDefs/spn.lang
share/highlight/langDefs/sql.lang
share/highlight/langDefs/squirrel.lang
share/highlight/langDefs/sybase.lang
share/highlight/langDefs/tcl.lang
share/highlight/langDefs/tcsh.lang
@ -165,47 +167,86 @@ share/highlight/langDefs/verilog.lang
share/highlight/langDefs/vhd.lang
share/highlight/langDefs/xml.lang
share/highlight/langDefs/xpp.lang
share/highlight/langDefs/y.lang
share/highlight/langDefs/yaiff.lang
share/highlight/langDefs/znn.lang
share/highlight/themes/
share/highlight/themes/acid.style
share/highlight/themes/bipolar.style
share/highlight/themes/blacknblue.style
share/highlight/themes/bright.style
share/highlight/themes/contrast.style
share/highlight/themes/darkblue.style
share/highlight/themes/darkness.style
share/highlight/themes/desert.style
share/highlight/themes/easter.style
share/highlight/themes/emacs.style
share/highlight/themes/golden.style
share/highlight/themes/greenlcd.style
share/highlight/themes/ide-anjuta.style
share/highlight/themes/ide-codewarrior.style
share/highlight/themes/ide-eclipse.style
share/highlight/themes/ide-kdev.style
share/highlight/themes/ide-msvs2008.style
share/highlight/themes/ide-xcode.style
share/highlight/themes/jedit.style
share/highlight/themes/kwrite.style
share/highlight/themes/lucretia.style
share/highlight/themes/matlab.style
share/highlight/themes/moe.style
share/highlight/themes/navy.style
share/highlight/themes/nedit.style
share/highlight/themes/neon.style
share/highlight/themes/night.style
share/highlight/themes/orion.style
share/highlight/themes/pablo.style
share/highlight/themes/peachpuff.style
share/highlight/themes/print.style
share/highlight/themes/rand01.style
share/highlight/themes/seashell.style
share/highlight/themes/the.style
share/highlight/themes/typical.style
share/highlight/themes/vampire.style
share/highlight/themes/vim-dark.style
share/highlight/themes/vim.style
share/highlight/themes/whitengrey.style
share/highlight/themes/zellner.style
share/highlight/themes/acid.theme
share/highlight/themes/aiseered.theme
share/highlight/themes/anotherdark.theme
share/highlight/themes/autumn.theme
share/highlight/themes/baycomb.theme
share/highlight/themes/bclear.theme
share/highlight/themes/biogoo.theme
share/highlight/themes/bipolar.theme
share/highlight/themes/blacknblue.theme
share/highlight/themes/bluegreen.theme
share/highlight/themes/breeze.theme
share/highlight/themes/bright.theme
share/highlight/themes/camo.theme
share/highlight/themes/candy.theme
share/highlight/themes/clarity.theme
share/highlight/themes/dante.theme
share/highlight/themes/darkblue.theme
share/highlight/themes/darkbone.theme
share/highlight/themes/darkness.theme
share/highlight/themes/darkslategray.theme
share/highlight/themes/darkspectrum.theme
share/highlight/themes/denim.theme
share/highlight/themes/desertEx.theme
share/highlight/themes/dusk.theme
share/highlight/themes/earendel.theme
share/highlight/themes/easter.theme
share/highlight/themes/edit-anjuta.theme
share/highlight/themes/edit-eclipse.theme
share/highlight/themes/edit-emacs.theme
share/highlight/themes/edit-flashdevelop.theme
share/highlight/themes/edit-gedit.theme
share/highlight/themes/edit-jedit.theme
share/highlight/themes/edit-kwrite.theme
share/highlight/themes/edit-matlab.theme
share/highlight/themes/edit-msvs2008.theme
share/highlight/themes/edit-nedit.theme
share/highlight/themes/edit-vim-dark.theme
share/highlight/themes/edit-vim.theme
share/highlight/themes/edit-xcode.theme
share/highlight/themes/ekvoli.theme
share/highlight/themes/fine_blue.theme
share/highlight/themes/freya.theme
share/highlight/themes/fruit.theme
share/highlight/themes/golden.theme
share/highlight/themes/greenlcd.theme
share/highlight/themes/kellys.theme
share/highlight/themes/leo.theme
share/highlight/themes/lucretia.theme
share/highlight/themes/manxome.theme
share/highlight/themes/maroloccio.theme
share/highlight/themes/matrix.theme
share/highlight/themes/moe.theme
share/highlight/themes/molokai.theme
share/highlight/themes/moria.theme
share/highlight/themes/navajo-night.theme
share/highlight/themes/navy.theme
share/highlight/themes/neon.theme
share/highlight/themes/night.theme
share/highlight/themes/nightshimmer.theme
share/highlight/themes/nuvola.theme
share/highlight/themes/oceandeep.theme
share/highlight/themes/olive.theme
share/highlight/themes/orion.theme
share/highlight/themes/pablo.theme
share/highlight/themes/peaksea.theme
share/highlight/themes/print.theme
share/highlight/themes/rand01.theme
share/highlight/themes/rdark.theme
share/highlight/themes/relaxedgreen.theme
share/highlight/themes/rootwater.theme
share/highlight/themes/seashell.theme
share/highlight/themes/sienna.theme
share/highlight/themes/tabula.theme
share/highlight/themes/tcsoft.theme
share/highlight/themes/vampire.theme
share/highlight/themes/whitengrey.theme
share/highlight/themes/xoria256.theme
share/highlight/themes/zellner.theme
share/highlight/themes/zenburn.theme
share/highlight/themes/zmrok.theme