Split common part to Makefile.common.

While here, fix some PKGCONFIG_OVERRIDE and REPLACE_PERL paths.

2 files changed, 67 insertions, 53 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 8a8d80abcf9..255199b8364 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,61 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2011/07/08 17:27:29 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2011/08/21 13:26:41 obache Exp $
+
+.include "Makefile.common"
 
-DISTNAME=	webkit-1.4.2
 PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
-CATEGORIES=	www
-MASTER_SITES=	http://www.webkitgtk.org/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.webkitgtk.org/
 COMMENT=	GTK2 port of the WebKit browser engine
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt
-
-PKGCONFIG_OVERRIDE=	WebKit/gtk/webkit.pc.in
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-MAKE_JOBS_SAFE=		no
-
-MAKE_FILE=	GNUmakefile
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS+=	--with-target=x11 \
-			--with-font-backend=freetype
-.include "options.mk"
-
-REPLACE_PERL+=	JavaScriptCore/pcre/dftables \
-		JavaScriptCore/create_hash_table \
-		WebCore/bindings/scripts/generate-bindings.pl \
-		WebCore/bindings/scripts/InFilesParser.pm \
-		WebCore/platform/text/mac/make-charset-table.pl \
-		WebCore/css/*.pl \
-		WebCore/dom/*.pl \
-		WebCore/platform/text/mac/*.pl
-
-BUILDLINK_DEPMETHOD.python= build
-.include "../../lang/python/application.mk"
-CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
+CONFIGURE_ARGS+=	--with-gtk=2.0
 
-.include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/flex/buildlink3.mk"
-.include "../../devel/gperf/buildlink3.mk"
-# This is optional, but needs testing.
-#.include "../../devel/pango/buildlink3.mk"
-# A correct Webkit build requires flex 2.5.33
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
-.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.34.2
-.include "../../net/libsoup24/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
new file mode 100644
index 00000000000..9f7db23aaff
--- /dev/null
+++ b/www/webkit-gtk/Makefile.common
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile.common,v 1.1 2011/08/21 13:26:41 obache Exp $
+# used by www/webkit-gtk/Makefile
+# used by www/webkit-gtk3/Makefile
+
+DISTNAME=	webkit-1.4.2
+CATEGORIES=	www
+MASTER_SITES=	http://www.webkitgtk.org/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.webkitgtk.org/
+
+DISTINFO_FILE=		${.CURDIR}/../../www/webkit-gtk/distinfo
+PATCHDIR=		${.CURDIR}/../../www/webkit-gtk/patches
+
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
+USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt
+
+PKGCONFIG_OVERRIDE=	Source/WebKit/gtk/webkit.pc.in
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+MAKE_JOBS_SAFE=		no
+
+MAKE_FILE=	GNUmakefile
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--with-target=x11 \
+			--with-font-backend=freetype
+.include "options.mk"
+
+REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table \
+		Source/WebCore/bindings/scripts/generate-bindings.pl \
+		Source/WebCore/bindings/scripts/InFilesParser.pm \
+		Source/WebCore/platform/text/mac/make-charset-table.pl \
+		Source/WebCore/css/*.pl \
+		Source/WebCore/dom/*.pl \
+		Source/WebCore/inspector/xxd.pl \
+		Source/WebCore/make-hash-tools.pl \
+		Source/WebCore/platform/text/mac/*.pl
+
+BUILDLINK_DEPMETHOD.python= build
+.include "../../lang/python/application.mk"
+CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
+
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/flex/buildlink3.mk"
+.include "../../devel/gperf/buildlink3.mk"
+# This is optional, but needs testing.
+#.include "../../devel/pango/buildlink3.mk"
+# A correct Webkit build requires flex 2.5.33
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.34.2
+.include "../../net/libsoup24/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"