- Update to 30549

- Remove webkit and make webkit-qt4 use webkit-gtk2 for the master port Someone with qmake knowledge plese look at webkit-qt4, libraries are linked without a version number... git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10491 df743ca5-7f9a-e211-a948-0013205c9059
author: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> 2008-02-25 06:04:46 +0800
committer: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> 2008-02-25 06:04:46 +0800
commit: c17c31108375ba35f377b67ad8604583e6a8c91d (patch)
tree: 5ec567aaa9b11e3d7432eb933163a1a96229fa2a
parent: 3bbf16970a56431bd614d89e75932654428e17aa (diff)
download: marcuscom-ports-c17c31108375ba35f377b67ad8604583e6a8c91d.tar.gz
marcuscom-ports-c17c31108375ba35f377b67ad8604583e6a8c91d.tar.zst
marcuscom-ports-c17c31108375ba35f377b67ad8604583e6a8c91d.zip
10 files changed, 57 insertions, 109 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index e415cd778..c5ae23840 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,15 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.1 2008/02/07 05:54:24 mezz Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.2 2008/02/23 19:33:48 ahze Exp $
 #
 
 PORTNAME=	webkit
-PORTVERSION=	0.0.30028
-PORTREVISION=	1
+PORTVERSION=	0.0.30549
 CATEGORIES=	www
 MASTER_SITES=	http://nightly.webkit.org/files/trunk/src/
-PKGNAMESUFFIX=	-gtk2
+PKGNAMESUFFIX=	${WEBKIT_PKGNAMESUFFIX}
 DISTNAME=	WebKit-r${PORTVERSION:S/0.0.//}
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,23 +20,36 @@ LIB_DEPENDS=	icutu.38:${PORTSDIR}/devel/icu \
 		curl.4:${PORTSDIR}/ftp/curl \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3
 
+WANT_GSTREAMER=	yes
 USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 libxslt
+USE_GNOME=	gnometarget libxslt
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf:261 automake:110 libtool:15
-USE_GSTREAMER=	gnomevfs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-webkit-target=x11 \
 		--enable-icon-database \
 		--enable-svg \
 		--enable-video
+
+.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
+USE_QT_VER=	4
+QT_COMPONENTS+=	qmake_build moc_build gui xml network
+WEBKIT_PKGNAMESUFFIX=	-qt
+INSTALL_WRKSRC=	${WRKSRC}/WebKitBuild/Release
+.else
+USE_GNOME+=     gtk20
+WEBKIT_PKGNAMESUFFIX=	-gtk
+USE_GSTREAMER+=	gnomevfs
+USE_AUTOTOOLS+=	autoconf:261 automake:110 libtool:15
 MAKEFILE=	GNUmakefile
+.endif
 
 post-patch:
+.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
+.else
 	@${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \
 		s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \
 		s|autoheader|${AUTOHEADER}|g ; \
@@ -46,8 +58,33 @@ post-patch:
 			${WRKSRC}/autogen.sh
 	@${FIND} ${WRKSRC} -name GNUmakefile.am | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
+.endif
 
 pre-configure:
+.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
+.else
 	@(cd ${WRKSRC} && ${SH} autogen.sh)
+.endif
+
+pre-install:
+.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
+	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
+		${INSTALL_WRKSRC}/WebCore/Makefile
+	@${MKDIR} ${INSTALL_WRKSRC}/libdata
+	@${CP} -Rf ${INSTALL_WRKSRC}/lib/pkgconfig ${INSTALL_WRKSRC}/libdata/
+.endif
+
+do-build:
+.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
+	@(cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${PERL5} WebKitTools/Scripts/build-webkit --qt4 --qmake=${QMAKE} \
+	--qmakearg=WEBKIT_INC_DIR=${PREFIX}/include/WebKit --qmakearg=WEBKIT_LIB_DIR=${PREFIX}/lib)
+.endif
+
+post-install:
+.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
+.else
+# Install compat pkg-config file so we don't have to patch ports
+	${CP} ${PREFIX}/libdata/pkgconfig/webkit-1.0.pc ${PREFIX}/libdata/pkgconfig/WebKitGtk.pc
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo
index dbd49879c..b91ff2311 100644
--- a/www/webkit-gtk2/distinfo
+++ b/www/webkit-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (WebKit-r30028.tar.bz2) = ac0464ebc8551e3f2e491bc6b05f9661
-SHA256 (WebKit-r30028.tar.bz2) = 5ac099387d30c89484519899c00781d6b56381cd62ac933b443f34c3b99f8e86
-SIZE (WebKit-r30028.tar.bz2) = 8748252
+MD5 (WebKit-r30549.tar.bz2) = 081ce2cb23cf564454bfc5a3d627a4bb
+SHA256 (WebKit-r30549.tar.bz2) = 7c9b9607fcb0909298c5d4c3ec47040082db139a28aca2547b2f657afe98b6cd
+SIZE (WebKit-r30549.tar.bz2) = 8573000
diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist
index 53ba030b4..71b65eff0 100644
--- a/www/webkit-gtk2/pkg-plist
+++ b/www/webkit-gtk2/pkg-plist
@@ -19,6 +19,7 @@ lib/libWebKitGtk.a
 lib/libWebKitGtk.la
 lib/libWebKitGtk.so
 lib/libWebKitGtk.so.1
+libdata/pkgconfig/WebKitGtk.pc
 libdata/pkgconfig/webkit-1.0.pc
 @dirrm include/WebKit/webkit
 @dirrm include/WebKit/JavaScriptCore
diff --git a/www/webkit-qt4/Makefile b/www/webkit-qt4/Makefile
index 4a25abef5..c16757604 100644
--- a/www/webkit-qt4/Makefile
+++ b/www/webkit-qt4/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports-experimental/www/webkit-qt4/Makefile,v 1.1 2007/10/25 15:28:38 ahze Exp $
+#    $MCom: ports/www/webkit-qt4/Makefile,v 1.1 2007/11/02 12:51:18 ahze Exp $
 
 PKGNAMESUFFIX=	-qt4
 
-MASTERDIR=	${.CURDIR}/../../www/webkit
+MASTERDIR=	${.CURDIR}/../../www/webkit-gtk2
 
 WEBKIT_SLAVE=	qt4
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/www/webkit-qt4/pkg-plist b/www/webkit-qt4/pkg-plist
index 99d7826f4..ca9ffd7c7 100644
--- a/www/webkit-qt4/pkg-plist
+++ b/www/webkit-qt4/pkg-plist
@@ -6,12 +6,15 @@ include/QtWebKit/qwebnetworkinterface.h
 include/QtWebKit/qwebobjectplugin.h
 include/QtWebKit/qwebobjectpluginconnector.h
 include/QtWebKit/qwebpage.h
-include/QtWebKit/qwebpagehistory.h
 include/QtWebKit/qwebsettings.h
+include/QtWebKit/qwebview.h
 lib/libQtWebKit.prl
 lib/libQtWebKit.so
-lib/libQtWebKit.so.1
-lib/libQtWebKit.so.1.0
-lib/libQtWebKit.so.1.0.0
+lib/libQtWebKit.so.
+lib/libQtWebKit.so..
+lib/libQtWebKit.so...
+lib/qt4/plugins/imageformats/libqtwebico.so
 libdata/pkgconfig/QtWebKit.pc
 mkspecs/features/qtwebkit.prf
+@dirrm mkspecs/features
+@dirrm include/QtWebKit
diff --git a/www/webkit/Makefile b/www/webkit/Makefile
deleted file mode 100644
index 57b62c9be..000000000
--- a/www/webkit/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for:	webkit
-# Date created:		2007-10-21
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports-experimental/www/webkit/Makefile,v 1.5 2007/10/25 13:23:08 ahze Exp $
-
-PORTNAME=	webkit
-PORTVERSION=	27033
-CATEGORIES=	www gnome
-MASTER_SITES=	http://nightly.webkit.org/files/trunk/src/
-#MASTER_SITES=	LOCAL/ahze
-DISTNAME=	WebKit-r${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An opensource browser engine
-
-LIB_DEPENDS=	icutu.36:${PORTSDIR}/devel/icu \
-		curl.4:${PORTSDIR}/ftp/curl \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3
-
-USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build moc_build
-USE_GNOME=	libxml2
-USE_BISON=	build
-INSTALL_WRKSRC=	${WRKSRC}/WebKitBuild/Release
-BUILD_SCRIPT=	WebKitTools/Scripts/build-webkit
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
-
-.if defined(WEBKIT_SLAVE) && ${WEBKIT_SLAVE}=="qt4"
-QT_COMPONENTS+=	gui xml network
-WEBKIT_GUI=	qt
-.else
-USE_GNOME+=	gtk20
-WEBKIT_GUI=	gtk
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|Linux i686|${OPSYS} ${ARCH}|' \
-		${WRKSRC}/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
-	@${REINPLACE_CMD} -e 's|Intel; Linux;|${ARCH}; ${OPSYS};|' \
-		${WRKSRC}/WebKit/qt/Api/qwebnetworkinterface.cpp
-
-do-build:
-	@(cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${PERL5} ${BUILD_SCRIPT} --${WEBKIT_GUI} --qmake=${QMAKE} \
-	--qmakearg=WEBKIT_INC_DIR=${PREFIX}/include/WebKit --qmakearg=WEBKIT_LIB_DIR=${PREFIX}/lib)
-
-pre-install:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
-		${INSTALL_WRKSRC}/WebCore/Makefile
-	@${MKDIR} ${INSTALL_WRKSRC}/libdata
-	@${CP} -Rf ${INSTALL_WRKSRC}/lib/pkgconfig ${INSTALL_WRKSRC}/libdata/
-
-do-install:
-	@(cd ${INSTALL_WRKSRC} && ${MAKE} install)
-
-.include <bsd.port.post.mk>
diff --git a/www/webkit/distinfo b/www/webkit/distinfo
deleted file mode 100644
index 4508ae978..000000000
--- a/www/webkit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (WebKit-r27033.tar.bz2) = 898401d1a89bbb5fbc72a9efcc439475
-SHA256 (WebKit-r27033.tar.bz2) = fb5320e16ea20c68fca64489e07350de8078fca696b2d9e4b34b39809efe9b88
-SIZE (WebKit-r27033.tar.bz2) = 7052932
diff --git a/www/webkit/files/patch-JavaScriptCore_kjs_config.h b/www/webkit/files/patch-JavaScriptCore_kjs_config.h
deleted file mode 100644
index 6490c04af..000000000
--- a/www/webkit/files/patch-JavaScriptCore_kjs_config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- JavaScriptCore/kjs/config.h.orig	2007-10-21 18:03:53.025920053 -0400
-+++ JavaScriptCore/kjs/config.h	2007-10-21 18:04:04.504783428 -0400
-@@ -72,7 +72,7 @@
- #define HAVE_PTHREAD_NP_H 1
- #endif
- 
--#define HAVE_PCREPOSIX 1
-+#undef HAVE_PCREPOSIX
- 
- /* FIXME: if all platforms have these, do they really need #defines? */
- #define HAVE_STDINT_H 1
diff --git a/www/webkit/pkg-descr b/www/webkit/pkg-descr
deleted file mode 100644
index 40ef1e3ef..000000000
--- a/www/webkit/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-WebKit is an open source web browser engine. It is able to display content
-such as HTML, SVG, XML, and others. It also supports DOM, XMLHttpRequest,
-XSLT, CSS, Javascript/ECMAscript and more.
-
-WWW: http://webkit.org/
diff --git a/www/webkit/pkg-plist b/www/webkit/pkg-plist
deleted file mode 100644
index fe67fa485..000000000
--- a/www/webkit/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-include/WebKit/webkitgtkdefines.h
-include/WebKit/webkitgtkframe.h
-include/WebKit/webkitgtkglobal.h
-include/WebKit/webkitgtknetworkrequest.h
-include/WebKit/webkitgtkpage.h
-include/WebKit/webkitgtksettings.h
-lib/libWebKitGtk.prl
-lib/libWebKitGtk.so
-lib/libWebKitGtk.so.1
-lib/libWebKitGtk.so.1.0
-lib/libWebKitGtk.so.1.0.0
-libdata/pkgconfig/WebKitGtk.pc
-@dirrm include/WebKit
author	ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>	2008-02-25 06:04:46 +0800
committer	ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>	2008-02-25 06:04:46 +0800
commit	c17c31108375ba35f377b67ad8604583e6a8c91d (patch)
tree	5ec567aaa9b11e3d7432eb933163a1a96229fa2a
parent	3bbf16970a56431bd614d89e75932654428e17aa (diff)
download	marcuscom-ports-c17c31108375ba35f377b67ad8604583e6a8c91d.tar.gz marcuscom-ports-c17c31108375ba35f377b67ad8604583e6a8c91d.tar.zst marcuscom-ports-c17c31108375ba35f377b67ad8604583e6a8c91d.zip