svn commit: r420884 - in head/textproc/source-highlight: . files
Kevin Lo
kevlo at FreeBSD.org
Fri Aug 26 01:02:38 UTC 2016
Author: kevlo
Date: Fri Aug 26 01:02:36 2016
New Revision: 420884
URL: https://svnweb.freebsd.org/changeset/ports/420884
Log:
Fix the run dependency and install the bash completion file.
PR: 212154
Submitted by: Tobias Kortkamp <t at tobik.me>
Added:
head/textproc/source-highlight/files/patch-gl_stdbool.in.h (contents, props changed)
Deleted:
head/textproc/source-highlight/files/patch-stdbool.in.h
Modified:
head/textproc/source-highlight/Makefile
head/textproc/source-highlight/files/patch-configure
head/textproc/source-highlight/files/patch-gl_getopt.in.h
head/textproc/source-highlight/files/patch-src-cmdline.c
head/textproc/source-highlight/files/patch-tests_Makefile.in
head/textproc/source-highlight/pkg-plist
Modified: head/textproc/source-highlight/Makefile
==============================================================================
--- head/textproc/source-highlight/Makefile Thu Aug 25 23:31:14 2016 (r420883)
+++ head/textproc/source-highlight/Makefile Fri Aug 26 01:02:36 2016 (r420884)
@@ -3,35 +3,33 @@
PORTNAME= source-highlight
PORTVERSION= 3.1.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= GNU/src-highlite
MAINTAINER= kevlo at FreeBSD.org
COMMENT= C/C++ and Java sources to HTML converter
-BROKEN_powerpc64= Does not build
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= exctags:devel/ctags
LIB_DEPENDS= libboost_regex.so:devel/boost-libs
+BROKEN_powerpc64= Does not build
+BROKEN_sparc64= Does not compile with GCC 4.2
+
GNU_CONFIGURE= yes
-LDFLAGS+= -L${LOCALBASE}/lib
-CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ARGS= --with-bash-completion
+
+INSTALL_TARGET= install-strip
-USES= gmake pathfix libtool
+USES= gmake pathfix libtool localbase
USE_LDCONFIG= yes
INFO= source-highlight source-highlight-lib
-OPTIONS_DEFINE= BASH DOCS EXAMPLES
-
-BROKEN_sparc64= Does not compile with GCC 4.2
-
-BASH_RUN_DEPENDS= ${LOCALBASE}/etc/bash_completion:shells/bash-completion
-BASH_CONFIGURE_WITH= --with-bash-completion
-
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= DOCS EXAMPLES
test: build
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} check)
Modified: head/textproc/source-highlight/files/patch-configure
==============================================================================
--- head/textproc/source-highlight/files/patch-configure Thu Aug 25 23:31:14 2016 (r420883)
+++ head/textproc/source-highlight/files/patch-configure Fri Aug 26 01:02:36 2016 (r420884)
@@ -1,6 +1,6 @@
---- configure.orig 2011-12-23 17:28:29.000000000 +0800
-+++ configure 2012-01-03 13:49:13.000000000 +0800
-@@ -3701,7 +3701,7 @@
+--- configure.orig 2011-12-23 09:28:29 UTC
++++ configure
+@@ -3701,7 +3701,7 @@ _ACEOF
source_highlightdatadir=$datadir/source-highlight
source_highlightdocdir=$docdir
source_highlightlibdocdir=$docdir/api
@@ -9,7 +9,7 @@
bash_completiondir=$sysconfdir/bash_completion.d
LIBRARY_NAMESPACE=srchilite
-@@ -20546,7 +20546,7 @@
+@@ -20546,7 +20546,7 @@ else
fi
Modified: head/textproc/source-highlight/files/patch-gl_getopt.in.h
==============================================================================
--- head/textproc/source-highlight/files/patch-gl_getopt.in.h Thu Aug 25 23:31:14 2016 (r420883)
+++ head/textproc/source-highlight/files/patch-gl_getopt.in.h Fri Aug 26 01:02:36 2016 (r420884)
@@ -1,5 +1,5 @@
---- gl/getopt.in.h.orig 2012-01-03 16:35:41.000000000 +0800
-+++ gl/getopt.in.h 2012-01-03 16:36:24.000000000 +0800
+--- gl/getopt.in.h.orig 2011-12-16 17:10:10 UTC
++++ gl/getopt.in.h
@@ -23,15 +23,6 @@
#endif
@PRAGMA_COLUMNS@
Added: head/textproc/source-highlight/files/patch-gl_stdbool.in.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/source-highlight/files/patch-gl_stdbool.in.h Fri Aug 26 01:02:36 2016 (r420884)
@@ -0,0 +1,14 @@
+--- gl/stdbool.in.h.orig 2011-12-16 17:10:10 UTC
++++ gl/stdbool.in.h
+@@ -105,11 +105,6 @@ typedef bool _Bool;
+ The only benefit of the enum, debuggability, is not important
+ with these compilers. So use 'signed char' and no enum. */
+ # define _Bool signed char
+-# else
+- /* With this compiler, trust the _Bool type if the compiler has it. */
+-# if !@HAVE__BOOL@
+-typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+-# endif
+ # endif
+ #endif
+ #define bool _Bool
Modified: head/textproc/source-highlight/files/patch-src-cmdline.c
==============================================================================
--- head/textproc/source-highlight/files/patch-src-cmdline.c Thu Aug 25 23:31:14 2016 (r420883)
+++ head/textproc/source-highlight/files/patch-src-cmdline.c Fri Aug 26 01:02:36 2016 (r420884)
@@ -1,6 +1,6 @@
---- src/cmdline.c.orig 2008-08-19 15:33:35.000000000 +0800
-+++ src/cmdline.c 2008-08-19 15:35:06.000000000 +0800
-@@ -194,7 +194,7 @@
+--- src/cmdline.c.orig 2011-12-24 10:22:43 UTC
++++ src/cmdline.c
+@@ -288,7 +288,7 @@ void clear_args (struct gengetopt_args_i
args_info->gen_references_orig = NULL;
args_info->ctags_file_arg = gengetopt_strdup ("tags");
args_info->ctags_file_orig = NULL;
Modified: head/textproc/source-highlight/files/patch-tests_Makefile.in
==============================================================================
--- head/textproc/source-highlight/files/patch-tests_Makefile.in Thu Aug 25 23:31:14 2016 (r420883)
+++ head/textproc/source-highlight/files/patch-tests_Makefile.in Fri Aug 26 01:02:36 2016 (r420884)
@@ -1,6 +1,6 @@
---- tests/Makefile.in.orig 2010-01-20 01:24:37.000000000 -0500
-+++ tests/Makefile.in 2010-01-20 01:26:27.000000000 -0500
-@@ -1884,7 +1884,7 @@
+--- tests/Makefile.in.orig 2016-08-25 16:54:10 UTC
++++ tests/Makefile.in
+@@ -2108,7 +2108,7 @@ check_defaults:
@NO_CTAGS_FALSE@ sed -itesttmp -e 's/\_tmp\.h/\.h/g' test_refs_tmp.h.html test_refs_tmp.cpp.html
@NO_CTAGS_FALSE@ sed -itesttmp -e 's/\_tmp\.cpp/\.cpp/g' test_refs_tmp.h.html test_refs_tmp.cpp.html
@NO_CTAGS_FALSE@ $(CPP2LATEX_WREFS) -i $(srcdir)/test.h -o test_ref.out.tex $(CTAGS_COMMAND_TMP)
Modified: head/textproc/source-highlight/pkg-plist
==============================================================================
--- head/textproc/source-highlight/pkg-plist Thu Aug 25 23:31:14 2016 (r420883)
+++ head/textproc/source-highlight/pkg-plist Fri Aug 26 01:02:36 2016 (r420884)
@@ -4,7 +4,7 @@ bin/java2html
bin/source-highlight
bin/source-highlight-settings
bin/src-hilite-lesspipe.sh
-%%BASH%%etc/bash_completion.d/source-highlight
+etc/bash_completion.d/source-highlight
include/srchilite/bufferedoutput.h
include/srchilite/chartranslator.h
include/srchilite/colormap.h
More information about the svn-ports-all
mailing list