Share common bits for SWIG bindings (Perl will be first). No

functional change intended.

4 files changed, 54 insertions, 26 deletions

diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index f06b3933105..d313043c02e 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -1,37 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2014/08/15 06:49:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2014/08/18 01:21:49 schmonz Exp $
 
-DISTNAME=		highlight-3.18
-CATEGORIES=		textproc
-MASTER_SITES=		http://www.andre-simon.de/zip/
-EXTRACT_SUFX=		.tar.bz2
+.include "../../textproc/highlight/Makefile.common"
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.andre-simon.de/
-COMMENT=		Converts source code to formatted text with syntax highlighting
-LICENSE=		gnu-gpl-v3
-
-USE_TOOLS+=		gmake pkg-config
-USE_LANGUAGES=		c c++
 MANCOMPRESSED=		yes
 
-MAKE_FILE=		makefile
 BUILD_TARGET=		cli
 
-PKG_SYSCONFSUBDIR=	highlight
-
 EGDIR=			${PREFIX}/share/examples/highlight
 CONF_FILES=		${EGDIR}/filetypes.conf			\
 			${PKG_SYSCONFDIR}/filetypes.conf
 
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	do-configure
-SUBST_FILES.paths=	src/core/datadir.cpp
-SUBST_SED.paths=	-e 's,/etc/highlight,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,/usr/share,${PREFIX}/share,g'
-
-.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/highlight/Makefile.common b/textproc/highlight/Makefile.common
new file mode 100644
index 00000000000..f1941d5f541
--- /dev/null
+++ b/textproc/highlight/Makefile.common
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2014/08/18 01:21:49 schmonz Exp $
+# used by textproc/highlight/Makefile
+# used by textproc/p5-highlight/Makefile
+
+DISTNAME=		highlight-${VERSION}
+VERSION=		3.18
+CATEGORIES=		textproc
+MASTER_SITES=		http://www.andre-simon.de/zip/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://www.andre-simon.de/
+COMMENT=		Converts source code to formatted text with syntax highlighting
+LICENSE=		gnu-gpl-v3
+
+USE_TOOLS+=		gmake pkg-config
+USE_LANGUAGES=		c c++
+MAKE_FILE=		makefile
+
+PATCHDIR=		${.CURDIR}/../../textproc/highlight/patches
+DISTINFO_FILE=		${.CURDIR}/../../textproc/highlight/distinfo
+DESCR_SRC=		${.CURDIR}/../../textproc/highlight/DESCR
+
+PKG_SYSCONFSUBDIR=	highlight
+
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Fixing hardcoded paths.
+SUBST_STAGE.paths=	do-configure
+SUBST_FILES.paths=	src/core/datadir.cpp src/makefile
+SUBST_SED.paths=	-e 's,/etc/highlight,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+=	-e 's,/usr/share,${PREFIX}/share,g'
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo
index dca0acc0c16..a03f6f6c569 100644
--- a/textproc/highlight/distinfo
+++ b/textproc/highlight/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2014/08/15 06:49:45 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2014/08/18 01:21:49 schmonz Exp $
 
 SHA1 (highlight-3.18.tar.bz2) = 985d0a3c707e3251fe50ffff66e11a8563777202
 RMD160 (highlight-3.18.tar.bz2) = 960b2a9ed6071b0f48ef45da2d006f5f00d9b578
 Size (highlight-3.18.tar.bz2) = 619669 bytes
 SHA1 (patch-aa) = 1cf4c6225b36e822a40ec10917384367914ecb0f
 SHA1 (patch-ab) = 592b8a2934d7e4c7f3c5a241737f4d09215932a4
+SHA1 (patch-examples_swig_makefile) = a252ca1f5a53d2edc590f2ccda8abfd42e32b965
diff --git a/textproc/highlight/patches/patch-examples_swig_makefile b/textproc/highlight/patches/patch-examples_swig_makefile
new file mode 100644
index 00000000000..b0f521be258
--- /dev/null
+++ b/textproc/highlight/patches/patch-examples_swig_makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_swig_makefile,v 1.1 2014/08/18 01:21:49 schmonz Exp $
+
+Use pkgsrc-specified compiler and flags.
+
+--- examples/swig/makefile.orig	2013-09-24 20:24:04.000000000 +0000
++++ examples/swig/makefile
+@@ -1,6 +1,6 @@
+ 
+-CXX=g++
+-CFLAGS=-g -O2 -fPIC
++#CXX=g++
++#CFLAGS=-g -O2 -fPIC
+ 
+ HL_INC=../../src/include/
+ HL_SRC=../../src/