Attachment 174068 Details for Bug 212154 – source-highlight.diff

[patch] source-highlight.diff

source-highlight.diff (text/plain), 6.34 KB, created by Tobias Kortkamp on 2016-08-25 17:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-08-25 17:13:27 UTC

Size: 6.34 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 420537)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	source-highlight
> PORTVERSION=	3.1.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	textproc
> MASTER_SITES=	GNU/src-highlite
> 
>@@ -10,29 +10,27 @@
> MAINTAINER=	kevlo@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
> 
>-USES=		gmake pathfix libtool
>+INSTALL_TARGET=	install-strip
>+
>+USES=		gmake pathfix libtool localbase
> USE_LDCONFIG=	yes
> 
> INFO=	source-highlight source-highlight-lib
> 
>-OPTIONS_DEFINE=	BASH DOCS EXAMPLES
>+OPTIONS_DEFINE=	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
>-
> test: build
> 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} check)
> 
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 420537)
>+++ files/patch-configure	(working copy)
>@@ -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
>  
>  
>Index: files/patch-gl_getopt.in.h
>===================================================================
>--- files/patch-gl_getopt.in.h	(revision 420537)
>+++ files/patch-gl_getopt.in.h	(working copy)
>@@ -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@
>Index: files/patch-gl_stdbool.in.h
>===================================================================
>--- files/patch-gl_stdbool.in.h	(nonexistent)
>+++ files/patch-gl_stdbool.in.h	(working copy)
>@@ -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
>
>Property changes on: files/patch-gl_stdbool.in.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src-cmdline.c
>===================================================================
>--- files/patch-src-cmdline.c	(revision 420537)
>+++ files/patch-src-cmdline.c	(working copy)
>@@ -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;
>Index: files/patch-stdbool.in.h
>===================================================================
>--- files/patch-stdbool.in.h	(revision 420537)
>+++ files/patch-stdbool.in.h	(nonexistent)
>@@ -1,14 +0,0 @@
>---- gl/stdbool.in.h.orig	2010-04-19 14:33:17.000000000 +0800
>-+++ gl/stdbool.in.h	2010-04-19 14:36:05.000000000 +0800
>-@@ -102,11 +102,6 @@
>-         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
>
>Property changes on: files/patch-stdbool.in.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-tests_Makefile.in
>===================================================================
>--- files/patch-tests_Makefile.in	(revision 420537)
>+++ files/patch-tests_Makefile.in	(working copy)
>@@ -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)
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 420537)
>+++ pkg-plist	(working copy)
>@@ -4,7 +4,7 @@
> 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

Flags:

tobik: maintainer-approval? (kevlo)

Actions: View | Diff

Attachments on bug 212154: 174068