Attachment #102272 for bug #142048

View | Details | Raw Unified | Return to bug 142048
Collapse All | Expand All




#

PORTNAME=	google-gadgets
PORTVERSION=	0.11.1
PORTREVISION=	2
CATEGORIES=	deskutils
MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}

COMMENT=	Google Desktop Gadgets

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
		${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \
		${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl \
		${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc:${PORTSDIR}/textproc/libxml2 \
		${LOCALBASE}/libdata/pkgconfig/firefox-gtkmozembed.pc:${PORTSDIR}/www/firefox \
		${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
		${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2 \
		${LOCALBASE}/libdata/pkgconfig/libstartup-notification-1.0.pc:${PORTSDIR}/x11/startup-notification \
		zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
		xml2.5:${PORTSDIR}/textproc/libxml2 \
		dbus-1.3:${PORTSDIR}/devel/dbus \
		curl.5:${PORTSDIR}/ftp/curl \
		rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
RUN_DEPENDS=	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info

USE_BZIP2=	yes
USE_LDCONFIG=	yes

USE_GCC=	4.2+
USE_GSTREAMER=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
USE_AUTOTOOLS=	libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22
WANT_GNOME=	yes
USE_GNOME=	gnomehack


OPTIONS=	DEBUGGING	"Enable debug output on runtime"	on\
		GTK		"Build GTK Host"			on\
		QT		"Build Qt Host"				on\
		GTKWEBKIT	"Build with GTK Webkit support"		on\
		MOZILLA		"Build with Mozilla support"		on

.include <bsd.port.options.mk>

.if defined(WITH_QT)
USE_QT_VER=	4
QT_COMPONENTS=	webkit opengl gui corelib script network moc_build
.endif

.if defined(WITH_GTKWEBKIT)
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
.endif

.if defined(WITH_MOZILLA)
USE_GECKO=	libxul firefox mozilla seamonkey xulrunner
.endif

.if defined(WITHOUT_GTKWEBKIT) && defined(WITHOUT_MOZILLA) && defined(WITH_GTK)
IGNORE=	gtk host requires GTK Webkit or/and Mozilla support to be enabled. Please, rerun 'make config'
.elif defined(WITH_GTKWEBKIT) && defined(WITHOUT_GTK)
.undef WITHOUT_GTK
WITH_GTK=yes

pre-everything::
	@${ECHO_MSG} "==> GTK Webkit or/and Mozilla support is enabled."
	@${ECHO_MSG} "==> Enabling GTK support. If this is not desired,"
	@${ECHO_MSG} "==> please rerun 'make config'."
.endif

.include <bsd.port.pre.mk>

CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations"

.if ${OSVERSION} < 700000
IGNORE=	needs 7.X or higher
.endif

.if defined(WITH_DEBUGGING)


.if defined(WITHOUT_GTK)
PLIST_SUB+=	GTK="@comment "
CONFIGURE_ARGS+=	--disable-gtk-host \
			--disable-libggadget-gtk \
			--disable-gtkmoz-browser-element \
			--disable-gtk-system-framework \
			--disable-webkit-script-runtime \
			--disable-gtkwebkit-browser-element \
			--disable-soup-xml-http-request
.elif defined(WITH_GTK)
USE_GNOME=	gtk20
PLIST_SUB+=	GTK=""
CONFIGURE_ARGS+=	--enable-gtk-host
BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libsoup-2.4.pc:${PORTSDIR}/devel/libsoup
LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
CONFIGURE_ARGS+=	--with-ssl-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt

.endif

.if defined(WITHOUT_GTKWEBKIT)
PLIST_SUB+=	GTKWEBKIT="@comment "
CONFIGURE_ARGS+=	--disable-webkit-script-runtime	--disable-gtkwebkit-browser-element
.elif defined(WITH_GTKWEBKIT)
PLIST_SUB+=	GTKWEBKIT=""
.endif

.if defined(WITHOUT_MOZILLA)
PLIST_SUB+=	MOZILLA="@comment "
CONFIGURE_ARGS+=	--disable-smjs-script-runtime	--disable-gtkmoz-browser-element
.elif defined(WITH_MOZILLA)
PLIST_SUB+=	MOZILLA=""
.endif

.if defined(WITHOUT_QT)

CONFIGURE_ARGS+=	--disable-qt-host --disable-libggadget-qt --disable-qt-system-framework\
			--disable-qtwebkit-browser-element --disable-qt-script-runtime --disable-qt-xml-http-request
.else
USE_QT_VER=	4
QT_COMPONENTS=	webkit opengl gui corelib script network moc
PLIST_SUB+=	QT=""
CONFIGURE_ARGS+=	--enable-qt-host
.endif

.if defined(WITHOUT_QT) && defined(WITHOUT_GTK)
IGNORE=	requires GTK or/and Qt host to be enabled. Please, rerun 'make config'
.endif

post-patch:

Lines 1-3 Link Here

(-)google-gadgets/distinfo (-3 / +3 lines)
1	MD5 (google-gadgets-for-linux-0.10.5.tar.bz2) = fdad6bd761b6c603e457b5d0d92ec2f9	1	MD5 (google-gadgets-for-linux-0.11.1.tar.bz2) = 62fec129694e83d0de481667e3c785d8
2	SHA256 (google-gadgets-for-linux-0.10.5.tar.bz2) = 944810df4b134542a1e675e6d9518503466ce9398e8bfca5e3637d994ef5038d	2	SHA256 (google-gadgets-for-linux-0.11.1.tar.bz2) = 353eccec0b10bea3ee7cac7594d9c20af606484ba71f2e04df09f4ad78ce7dbe
3	SIZE (google-gadgets-for-linux-0.10.5.tar.bz2) = 2429875	3	SIZE (google-gadgets-for-linux-0.11.1.tar.bz2) = 2531591





$FreeBSD$

--- configure.ac.orig
+++ configure.ac
@@ -501,6 +501,13 @@
     GGL_PLATFORM_SHORT="\"linux\""
     GGL_PLATFORM="\"linux\""
     build_linux_system_framework=yes
     ;;
+  *freebsd* )
+    ggl_host_type=freebsd

   *solaris* )
     ggl_host_type=solaris
     PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
@@ -526,6 +533,7 @@
 AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])
 AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])
 AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])

 
 AC_SUBST(PREDEFINED_MACROS)
 AC_SUBST(DEFAULT_COMPILE_FLAGS)
@@ -651,7 +659,7 @@
 has_qtnetwork=no
 has_qtwebkit=no
 has_qtscript=no
 if test x$build_libggadget_qt = xyes; then
-  if test x$ggl_host_type = xlinux; then
+  if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then
     PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],
                       [has_qt4=yes
                        MOC=`$PKG_CONFIG --variable=moc_location QtCore`],
                         [has_gtkmozembed=xulrunner-gtkmozembed],
         [has_gtkmozembed=no])
       ;;
-    firefox2)
+    firefox2-gtkmozembed)
       PKG_CHECK_MODULES(GTKMOZEMBED, [firefox2-gtkmozembed],
                         [has_gtkmozembed=firefox2-gtkmozembed],
         [has_gtkmozembed=no])
       ;;
-    firefox)
+    firefox-gtkmozembed)
       PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed],
                         [has_gtkmozembed=firefox-gtkmozembed],
         [has_gtkmozembed=no])
@@ -783,11 +791,11 @@
     PKG_CHECK_MODULES(LIBMOZJS, [xulrunner-js],
 		      [has_libmozjs=xulrunner-js],
 		      [has_gtkmozembed=no]) ;;
-  firefox2)
+  firefox2-gtkmozembed)
     PKG_CHECK_MODULES(LIBMOZJS, [firefox2-js],
 		      [has_libmozjs=firefox2-js],
 		      [has_gtkmozembed=no]) ;;
-  firefox)
+  firefox-gtkmozembed)
     PKG_CHECK_MODULES(LIBMOZJS, [firefox-js],
 		      [has_libmozjs=firefox-js],
 		      [has_gtkmozembed=no]) ;;




include/google-gadgets/ggadget/js/js_utils.h
include/google-gadgets/ggadget/js/jscript_massager.h
include/google-gadgets/ggadget/label_element.h
include/google-gadgets/ggadget/light_map.h
include/google-gadgets/ggadget/listbox_element.h
include/google-gadgets/ggadget/locales.h
include/google-gadgets/ggadget/localized_file_manager.h

include/google-gadgets/ggadget/xml_parser_interface.h
include/google-gadgets/ggadget/xml_utils.h
include/google-gadgets/ggadget/zip_file_manager.h
%%GTK%%%%MOZILLA%%lib/google-gadgets/gtkmoz-browser-child
lib/google-gadgets/include/ggadget/sysdeps.h
lib/google-gadgets/modules/analytics-usage-collector.a
lib/google-gadgets/modules/analytics-usage-collector.la

%%GTK%%lib/google-gadgets/modules/gtk-system-framework.a
%%GTK%%lib/google-gadgets/modules/gtk-system-framework.la
%%GTK%%lib/google-gadgets/modules/gtk-system-framework.so
%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.a
%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.la
%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.so
%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.a
%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.la
%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.so
lib/google-gadgets/modules/html-flash-element.a
lib/google-gadgets/modules/html-flash-element.la
lib/google-gadgets/modules/html-flash-element.so
lib/google-gadgets/modules/libxml2-xml-parser.a
lib/google-gadgets/modules/libxml2-xml-parser.la
lib/google-gadgets/modules/libxml2-xml-parser.so

%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.a
%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.la
%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.so
%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.a
%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.la
%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.so
%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.a
%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.la
%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.so
%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.a
%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.la
%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.so
lib/libggadget-1.0.a
lib/libggadget-1.0.la
lib/libggadget-1.0.so

%%QT%%lib/libggadget-qt-1.0.la
%%QT%%lib/libggadget-qt-1.0.so
%%QT%%lib/libggadget-qt-1.0.so.0
%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.a
%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.la
%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.so
%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.so.0
lib/libggadget-xdg-1.0.a
lib/libggadget-xdg-1.0.la
lib/libggadget-xdg-1.0.so

Return to bug 142048

Lines 6-13 Link Here

(-)google-gadgets/Makefile (-18 / +69 lines)
6	#	6	#
7		7
8	PORTNAME= google-gadgets	8	PORTNAME= google-gadgets
9	PORTVERSION= 0.10.5	9	PORTVERSION= 0.11.1
10	PORTREVISION= 2
11	CATEGORIES= deskutils	10	CATEGORIES= deskutils
12	MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/	11	MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/
13	DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}	12	DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}
Lines 16-35 Link Here
16	COMMENT= Google Desktop Gadgets	15	COMMENT= Google Desktop Gadgets
17		16
18	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \	17	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
19	${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \
20	${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl \	18	${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl \
21	${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc:${PORTSDIR}/textproc/libxml2 \	19	${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc:${PORTSDIR}/textproc/libxml2 \
22	${LOCALBASE}/libdata/pkgconfig/firefox-gtkmozembed.pc:${PORTSDIR}/www/firefox \
23	${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \	20	${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
24	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2 \	21	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2 \
		22	${LOCALBASE}/libdata/pkgconfig/libstartup-notification-1.0.pc:${PORTSDIR}/x11/startup-notification \
25	zip:${PORTSDIR}/archivers/zip	23	zip:${PORTSDIR}/archivers/zip
26	LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \	24	LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
27	xml2.5:${PORTSDIR}/textproc/libxml2 \	25	xml2.5:${PORTSDIR}/textproc/libxml2 \
28	dbus-1.3:${PORTSDIR}/devel/dbus \	26	dbus-1.3:${PORTSDIR}/devel/dbus \
29	curl.5:${PORTSDIR}/ftp/curl \	27	curl.5:${PORTSDIR}/ftp/curl \
30	rsvg-2.2:${PORTSDIR}/graphics/librsvg2	28	rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
31	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \	29	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
32	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info	30	RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
33		31
34	USE_BZIP2= yes	32	USE_BZIP2= yes
35	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
Lines 37-44 Link Here
37	USE_GCC= 4.2+	35	USE_GCC= 4.2+
38	USE_GSTREAMER= yes	36	USE_GSTREAMER= yes
39	GNU_CONFIGURE= yes	37	GNU_CONFIGURE= yes
40	CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" CPPFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"	38	CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
41	CONFIGURE_ARGS= --enable-ltdl-install=no	39	CONFIGURE_ARGS= --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
42	USE_AUTOTOOLS= libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22	40	USE_AUTOTOOLS= libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22
43	WANT_GNOME= yes	41	WANT_GNOME= yes
44	USE_GNOME= gnomehack	42	USE_GNOME= gnomehack
Lines 46-57 Link Here
46		44
47	OPTIONS= DEBUGGING "Enable debug output on runtime" on\	45	OPTIONS= DEBUGGING "Enable debug output on runtime" on\
48	GTK "Build GTK Host" on\	46	GTK "Build GTK Host" on\
49	QT "Build Qt Host" on	47	QT "Build Qt Host" on\
		48	GTKWEBKIT "Build with GTK Webkit support" on\
		49	MOZILLA "Build with Mozilla support" on
		50
		51	.include <bsd.port.options.mk>
		52
		53	.if defined(WITH_QT)
		54	USE_QT_VER= 4
		55	QT_COMPONENTS= webkit opengl gui corelib script network moc_build
		56	.endif
		57
		58	.if defined(WITH_GTKWEBKIT)
		59	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
		60	LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
		61	.endif
		62
		63	.if defined(WITH_MOZILLA)
		64	USE_GECKO= libxul firefox mozilla seamonkey xulrunner
		65	.endif
		66
		67	.if defined(WITHOUT_GTKWEBKIT) && defined(WITHOUT_MOZILLA) && defined(WITH_GTK)
		68	IGNORE= gtk host requires GTK Webkit or/and Mozilla support to be enabled. Please, rerun 'make config'
		69	.elif defined(WITH_GTKWEBKIT) && defined(WITHOUT_GTK)
		70	.undef WITHOUT_GTK
		71	WITH_GTK=yes
		72
		73	pre-everything::
		74	@${ECHO_MSG} "==> GTK Webkit or/and Mozilla support is enabled."
		75	@${ECHO_MSG} "==> Enabling GTK support. If this is not desired,"
		76	@${ECHO_MSG} "==> please rerun 'make config'."
		77	.endif
50		78
51	.include <bsd.port.pre.mk>	79	.include <bsd.port.pre.mk>
52		80
		81	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations"
		82
53	.if ${OSVERSION} < 700000	83	.if ${OSVERSION} < 700000
54	IGNORE=This port needs 7.X or higher	84	IGNORE= needs 7.X or higher
55	.endif	85	.endif
56		86
57	.if defined(WITH_DEBUGGING)	87	.if defined(WITH_DEBUGGING)
Lines 60-72 Link Here
60		90
61	.if defined(WITHOUT_GTK)	91	.if defined(WITHOUT_GTK)
62	PLIST_SUB+= GTK="@comment "	92	PLIST_SUB+= GTK="@comment "
63	CONFIGURE_ARGS+= --disable-gtk-host --disable-libggadget-gtk --disable-gtkmoz-browser-element --disable-gtk-system-framework	93	CONFIGURE_ARGS+= --disable-gtk-host \
		94	--disable-libggadget-gtk \
		95	--disable-gtkmoz-browser-element \
		96	--disable-gtk-system-framework \
		97	--disable-webkit-script-runtime \
		98	--disable-gtkwebkit-browser-element \
		99	--disable-soup-xml-http-request
64	.elif defined(WITH_GTK)	100	.elif defined(WITH_GTK)
65	USE_GNOME= gtk20	101	USE_GNOME= gtk20
66	PLIST_SUB+= GTK=""	102	PLIST_SUB+= GTK=""
67	CONFIGURE_ARGS+= --enable-gtk-host --with-gtkmozembed=firefox-gtkmozembed	103	CONFIGURE_ARGS+= --enable-gtk-host
68	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libstartup-notification-1.0.pc:${PORTSDIR}/x11/startup-notification	104	BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libsoup-2.4.pc:${PORTSDIR}/devel/libsoup
69	LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification	105	LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup
		106	RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
		107	CONFIGURE_ARGS+= --with-ssl-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
		108
		109	.endif
		110
		111	.if defined(WITHOUT_GTKWEBKIT)
		112	PLIST_SUB+= GTKWEBKIT="@comment "
		113	CONFIGURE_ARGS+= --disable-webkit-script-runtime --disable-gtkwebkit-browser-element
		114	.elif defined(WITH_GTKWEBKIT)
		115	PLIST_SUB+= GTKWEBKIT=""
		116	.endif
		117
		118	.if defined(WITHOUT_MOZILLA)
		119	PLIST_SUB+= MOZILLA="@comment "
		120	CONFIGURE_ARGS+= --disable-smjs-script-runtime --disable-gtkmoz-browser-element
		121	.elif defined(WITH_MOZILLA)
		122	PLIST_SUB+= MOZILLA=""
70	.endif	123	.endif
71		124
72	.if defined(WITHOUT_QT)	125	.if defined(WITHOUT_QT)
Lines 74-87 Link Here
74	CONFIGURE_ARGS+= --disable-qt-host --disable-libggadget-qt --disable-qt-system-framework\	127	CONFIGURE_ARGS+= --disable-qt-host --disable-libggadget-qt --disable-qt-system-framework\
75	--disable-qtwebkit-browser-element --disable-qt-script-runtime --disable-qt-xml-http-request	128	--disable-qtwebkit-browser-element --disable-qt-script-runtime --disable-qt-xml-http-request
76	.else	129	.else
77	USE_QT_VER= 4
78	QT_COMPONENTS= webkit opengl gui corelib script network moc
79	PLIST_SUB+= QT=""	130	PLIST_SUB+= QT=""
80	CONFIGURE_ARGS+= --enable-qt-host	131	CONFIGURE_ARGS+= --enable-qt-host
81	.endif	132	.endif
82		133
83	.if defined(WITHOUT_QT) && defined(WITHOUT_GTK)	134	.if defined(WITHOUT_QT) && defined(WITHOUT_GTK)
84	IGNORE=This port requires GTK or Qt host to be enabled	135	IGNORE= requires GTK or/and Qt host to be enabled. Please, rerun 'make config'
85	.endif	136	.endif
86		137
87	post-patch:	138	post-patch:

Lines 1-11 Link Here

(-)google-gadgets/files/patch-configure.ac (-40 / +11 lines)
1		1
2	$FreeBSD: ports/deskutils/google-gadgets/files/patch-configure.ac,v 1.4 2009/03/08 12:53:52 beat Exp $	2	$FreeBSD$
3		3
4	--- configure.ac.orig	4	--- configure.ac.orig
5	+++ configure.ac	5	+++ configure.ac
6	@@ -422,6 +422,13 @@	6	@@ -501,6 +501,13 @@
7	GGL_PLATFORM_SHORT="\"linux\""
8	GGL_PLATFORM="\"linux\""	7	GGL_PLATFORM="\"linux\""
		8	build_linux_system_framework=yes
9	;;	9	;;
10	+ freebsd )	10	+ freebsd )
11	+ ggl_host_type=freebsd	11	+ ggl_host_type=freebsd
Lines 17-23 Link Here
17	solaris )	17	solaris )
18	ggl_host_type=solaris	18	ggl_host_type=solaris
19	PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"	19	PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
20	@@ -442,6 +449,7 @@	20	@@ -526,6 +533,7 @@
21	AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])	21	AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])
22	AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])	22	AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])
23	AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])	23	AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])
Lines 25-65 Link Here
25		25
26	AC_SUBST(PREDEFINED_MACROS)	26	AC_SUBST(PREDEFINED_MACROS)
27	AC_SUBST(DEFAULT_COMPILE_FLAGS)	27	AC_SUBST(DEFAULT_COMPILE_FLAGS)
28	@@ -558,7 +566,7 @@	28	@@ -651,7 +659,7 @@
29	has_qtnetwork=no
30	has_qtwebkit=no	29	has_qtwebkit=no
31	has_qtscript=no	30	has_qtscript=no
32	-if test x$ggl_host_type = xlinux; then	31	if test x$build_libggadget_qt = xyes; then
33	+if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then	32	- if test x$ggl_host_type = xlinux; then
34	PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],	33	+ if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then
35	[has_qt4=yes	34	PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],
36	MOC=`$PKG_CONFIG --variable=moc_location QtCore`],	35	[has_qt4=yes
37	@@ -749,12 +757,12 @@	36	MOC=`$PKG_CONFIG --variable=moc_location QtCore`],
38	[has_gtkmozembed=xulrunner-gtkmozembed],
39	[has_gtkmozembed=no])
40	;;
41	- firefox2)
42	+ firefox2-gtkmozembed)
43	PKG_CHECK_MODULES(GTKMOZEMBED, [firefox2-gtkmozembed],
44	[has_gtkmozembed=firefox2-gtkmozembed],
45	[has_gtkmozembed=no])
46	;;
47	- firefox)
48	+ firefox-gtkmozembed)
49	PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed],
50	[has_gtkmozembed=firefox-gtkmozembed],
51	[has_gtkmozembed=no])
52	@@ -783,11 +791,11 @@
53	PKG_CHECK_MODULES(LIBMOZJS, [xulrunner-js],
54	[has_libmozjs=xulrunner-js],
55	[has_gtkmozembed=no]) ;;
56	- firefox2)
57	+ firefox2-gtkmozembed)
58	PKG_CHECK_MODULES(LIBMOZJS, [firefox2-js],
59	[has_libmozjs=firefox2-js],
60	[has_gtkmozembed=no]) ;;
61	- firefox)
62	+ firefox-gtkmozembed)
63	PKG_CHECK_MODULES(LIBMOZJS, [firefox-js],
64	[has_libmozjs=firefox-js],
65	[has_gtkmozembed=no]) ;;

Lines 62-67 Link Here

(-)google-gadgets/pkg-plist (-7 / +24 lines)
62	include/google-gadgets/ggadget/js/js_utils.h	62	include/google-gadgets/ggadget/js/js_utils.h
63	include/google-gadgets/ggadget/js/jscript_massager.h	63	include/google-gadgets/ggadget/js/jscript_massager.h
64	include/google-gadgets/ggadget/label_element.h	64	include/google-gadgets/ggadget/label_element.h
		65	include/google-gadgets/ggadget/light_map.h
65	include/google-gadgets/ggadget/listbox_element.h	66	include/google-gadgets/ggadget/listbox_element.h
66	include/google-gadgets/ggadget/locales.h	67	include/google-gadgets/ggadget/locales.h
67	include/google-gadgets/ggadget/localized_file_manager.h	68	include/google-gadgets/ggadget/localized_file_manager.h
Lines 136-142 Link Here
136	include/google-gadgets/ggadget/xml_parser_interface.h	137	include/google-gadgets/ggadget/xml_parser_interface.h
137	include/google-gadgets/ggadget/xml_utils.h	138	include/google-gadgets/ggadget/xml_utils.h
138	include/google-gadgets/ggadget/zip_file_manager.h	139	include/google-gadgets/ggadget/zip_file_manager.h
139	%%GTK%%lib/google-gadgets/gtkmoz-browser-child	140	%%GTK%%%%MOZILLA%%lib/google-gadgets/gtkmoz-browser-child
140	lib/google-gadgets/include/ggadget/sysdeps.h	141	lib/google-gadgets/include/ggadget/sysdeps.h
141	lib/google-gadgets/modules/analytics-usage-collector.a	142	lib/google-gadgets/modules/analytics-usage-collector.a
142	lib/google-gadgets/modules/analytics-usage-collector.la	143	lib/google-gadgets/modules/analytics-usage-collector.la
Lines 171-179 Link Here
171	%%GTK%%lib/google-gadgets/modules/gtk-system-framework.a	172	%%GTK%%lib/google-gadgets/modules/gtk-system-framework.a
172	%%GTK%%lib/google-gadgets/modules/gtk-system-framework.la	173	%%GTK%%lib/google-gadgets/modules/gtk-system-framework.la
173	%%GTK%%lib/google-gadgets/modules/gtk-system-framework.so	174	%%GTK%%lib/google-gadgets/modules/gtk-system-framework.so
174	%%GTK%%lib/google-gadgets/modules/gtkmoz-browser-element.a	175	%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.a
175	%%GTK%%lib/google-gadgets/modules/gtkmoz-browser-element.la	176	%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.la
176	%%GTK%%lib/google-gadgets/modules/gtkmoz-browser-element.so	177	%%GTK%%%%MOZILLA%%lib/google-gadgets/modules/gtkmoz-browser-element.so
		178	%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.a
		179	%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.la
		180	%%GTKWEBKIT%%lib/google-gadgets/modules/gtkwebkit-browser-element.so
		181	lib/google-gadgets/modules/html-flash-element.a
		182	lib/google-gadgets/modules/html-flash-element.la
		183	lib/google-gadgets/modules/html-flash-element.so
177	lib/google-gadgets/modules/libxml2-xml-parser.a	184	lib/google-gadgets/modules/libxml2-xml-parser.a
178	lib/google-gadgets/modules/libxml2-xml-parser.la	185	lib/google-gadgets/modules/libxml2-xml-parser.la
179	lib/google-gadgets/modules/libxml2-xml-parser.so	186	lib/google-gadgets/modules/libxml2-xml-parser.so
Lines 192-200 Link Here
192	%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.a	199	%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.a
193	%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.la	200	%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.la
194	%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.so	201	%%QT%%lib/google-gadgets/modules/qtwebkit-browser-element.so
195	lib/google-gadgets/modules/smjs-script-runtime.a	202	%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.a
196	lib/google-gadgets/modules/smjs-script-runtime.la	203	%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.la
197	lib/google-gadgets/modules/smjs-script-runtime.so	204	%%MOZILLA%%lib/google-gadgets/modules/smjs-script-runtime.so
		205	%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.a
		206	%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.la
		207	%%GTK%%lib/google-gadgets/modules/soup-xml-http-request.so
		208	%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.a
		209	%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.la
		210	%%GTKWEBKIT%%lib/google-gadgets/modules/webkit-script-runtime.so
198	lib/libggadget-1.0.a	211	lib/libggadget-1.0.a
199	lib/libggadget-1.0.la	212	lib/libggadget-1.0.la
200	lib/libggadget-1.0.so	213	lib/libggadget-1.0.so
Lines 219-224 Link Here
219	%%QT%%lib/libggadget-qt-1.0.la	232	%%QT%%lib/libggadget-qt-1.0.la
220	%%QT%%lib/libggadget-qt-1.0.so	233	%%QT%%lib/libggadget-qt-1.0.so
221	%%QT%%lib/libggadget-qt-1.0.so.0	234	%%QT%%lib/libggadget-qt-1.0.so.0
		235	%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.a
		236	%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.la
		237	%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.so
		238	%%GTKWEBKIT%%lib/libggadget-webkitjs-1.0.so.0
222	lib/libggadget-xdg-1.0.a	239	lib/libggadget-xdg-1.0.a
223	lib/libggadget-xdg-1.0.la	240	lib/libggadget-xdg-1.0.la
224	lib/libggadget-xdg-1.0.so	241	lib/libggadget-xdg-1.0.so