Attachment #112377 for bug #153784




# New ports collection makefile for:	cairo-dock
# Date created:		2011-01-06
# Whom:			Ivan Klymenko <fidaj@ukr.net>
#
# $FreeBSD: ports/deskutils/cairo-dock/Makefile,v 1.4 2010/07/12 03:05:49 miwi Exp $
#

PORTNAME=	cairo-dock
DISTVERSION=	2.2.0-4
CATEGORIES=	deskutils
MASTER_SITES=	http://launchpadlibrarian.net/56954298/

MAINTAINER=	fidaj@ukr.net
COMMENT=	Cairo-Dock is a light and eye-candy dock

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl

LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
		curl.6:${PORTSDIR}/ftp/curl \
		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext


USE_GMAKE=	yes
USE_GNOME=	gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
USE_LDCONFIG=	yes
USE_XORG=	xrender xtst
USE_CMAKE=	yes
MAKE_JOBS_SAFE=	yes

post-patch:
	${REINPLACE_CMD} -e 's,curl,fetch,g' ${WRKSRC}/po/*.po \
		${WRKSRC}/data/help.conf
	${REINPLACE_CMD} -e 's,/usr,${PREFIX},g'	\
		${WRKSRC}/src/gldit/cairo-dock-gui-factory.c

.include <bsd.port.pre.mk>


Lines 1-3 Link Here

(-)distinfo (-3 / +2 lines)
1	MD5 (cairo-dock-2.1.3-9.tar.gz) = f4b7f78770696b36efaa346df0bfa7d2	1	SHA256 (cairo-dock-2.2.0-4.tar.gz) = dc2de939e8fe8bb2b020d7c12c106114f321a104ea41d3538fbc1fce2fadff95
2	SHA256 (cairo-dock-2.1.3-9.tar.gz) = 0629ffc55a5c075daa74908627ad5a69315c3af22051458ec9489ed64d382ae5	2	SIZE (cairo-dock-2.2.0-4.tar.gz) = 2335519
3	SIZE (cairo-dock-2.1.3-9.tar.gz) = 2480328

Removed Link Here

(-)files/patch-Makefile.am (-11 lines)
1	--- src/Makefile.am.orig 2010-05-05 18:34:05.000000000 +0300
2	+++ src/Makefile.am 2010-05-05 18:34:23.000000000 +0300
3	@@ -46,8 +46,6 @@
4	-DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\
5	-DGL_GLEXT_PROTOTYPES=\""1"\"\
6	-std=c99\
7	- -O3\
8	- -g -ggdb\
9	-Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration
10	#-Wunreachable-code -Wno-unused-parameter -Wall
11

Removed Link Here

(-)files/patch-Makefile.in (-11 lines)
1	--- src/Makefile.in.orig 2010-05-05 18:34:41.000000000 +0300
2	+++ src/Makefile.in 2010-05-05 18:34:46.000000000 +0300
3	@@ -378,8 +378,6 @@
4	-DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\
5	-DGL_GLEXT_PROTOTYPES=\""1"\"\
6	-std=c99\
7	- -O3\
8	- -g -ggdb\
9	-Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration
10
11	#-Wunreachable-code -Wno-unused-parameter -Wall




--- configure.orig	2010-05-05 18:36:30.000000000 +0300
+++ configure	2010-05-05 18:36:48.000000000 +0300
@@ -13091,8 +13091,8 @@
 fi
 
  if test "$LIBCRYPT_LIBS" != "" ; then
-  HAVE_LIBCRYPT_TRUE=
-  HAVE_LIBCRYPT_FALSE='#'
+  HAVE_LIBCRYPT_TRUE='#'
+  HAVE_LIBCRYPT_FALSE=
 else
   HAVE_LIBCRYPT_TRUE='#'
   HAVE_LIBCRYPT_FALSE=




--- cairo-dock-package-theme.orig	2010-12-11 01:37:14.000000000 +0200
+++ cairo-dock-package-theme	2010-12-11 01:37:33.000000000 +0200
@@ -125,7 +125,7 @@
 	if test "x${theme}" != "x"; then
+#!/bin/sh
 
 # Packager for Cairo-Dock
@@ -126,5 +126,5 @@
 		#\__________ On cherche si ce theme est un theme officiel ou non.
 		echo "un theme est present ($theme)"
-		wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
+		fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
 		if test -f "liste.tmp" ; then
 			grep "^\[${theme}\]" "liste.tmp"
 			if test "$?" != "0" -a  "$theme" != "Classic" -a "$theme" != "default"; then  # pas un theme officiel
+++ src/cairo-dock-themes-manager.c	2010-06-28 18:47:19.000000000 +0200
@@ -143,8 +143,16 @@
 	//\_______________ On lance le download.
 	//gchar *cCommand = g_strdup_printf ("%s wget \"%s/%s/%s\" -O \"%s\" -t %d -T %d%s", (iShowActivity == 2 ? "$TERM -e '" : ""), cServerAdress, cDistantFilePath, cDistantFileName, cTmpFilePath, CAIRO_DOCK_DL_NB_RETRY, CAIRO_DOCK_DL_TIMEOUT, (iShowActivity == 2 ? "'" : ""));
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__)
+	gchar *cCommand = g_strdup_printf ("/usr/bin/fetch -qo \"%s\" -T %d \"%s/%s/%s\"",
+		cTmpFilePath,
+		cServerAdress, cDistantFilePath, cDistantFileName,
+		mySystem.iConnectionTimeout);
+	cd_debug ("download with 'MaxTime' and 'NbRetries' parameters ignored with fetch(1)");
+#else
 	gchar *cCommand = g_strdup_printf ("curl -s \"%s/%s/%s\" --output \"%s\" --connect-timeout %d --max-time %d --retry %d",
 		cServerAdress, cDistantFilePath, cDistantFileName,
 		cTmpFilePath,
 		mySystem.iConnectionTimeout, mySystem.iConnectiontMaxTime, mySystem.iConnectiontNbRetries);
+#endif
 	cd_debug ("download with '%s'", cCommand);
 	int r = system (cCommand);




bin/cairo-dock
bin/cairo-dock-package-theme
bin/launch-cairo-dock-with-delay
include/cairo-dock/cairo-dock.h
include/cairo-dock/cairo-dock/cairo-dock-X-manager.h
include/cairo-dock/cairo-dock/cairo-dock-X-utilities.h
include/cairo-dock/cairo-dock/cairo-dock-animations.h
include/cairo-dock/cairo-dock/cairo-dock-applet-canvas.h
include/cairo-dock/cairo-dock/cairo-dock-applet-facility.h
include/cairo-dock/cairo-dock/cairo-dock-applet-manager.h
include/cairo-dock/cairo-dock/cairo-dock-applet-multi-instance.h
include/cairo-dock/cairo-dock/cairo-dock-applet-single-instance.h
include/cairo-dock/cairo-dock/cairo-dock-application-factory.h
include/cairo-dock/cairo-dock/cairo-dock-application-facility.h
include/cairo-dock/cairo-dock/cairo-dock-applications-manager.h
include/cairo-dock/cairo-dock/cairo-dock-backends-manager.h
include/cairo-dock/cairo-dock/cairo-dock-callbacks.h
include/cairo-dock/cairo-dock/cairo-dock-class-manager.h
include/cairo-dock/cairo-dock/cairo-dock-config.h
include/cairo-dock/cairo-dock/cairo-dock-container.h
include/cairo-dock/cairo-dock/cairo-dock-data-renderer.h
include/cairo-dock/cairo-dock/cairo-dock-dbus.h
include/cairo-dock/cairo-dock/cairo-dock-desklet-factory.h
include/cairo-dock/cairo-dock/cairo-dock-desklet-manager.h
include/cairo-dock/cairo-dock/cairo-dock-dialog-factory.h
include/cairo-dock/cairo-dock/cairo-dock-dialog-manager.h
include/cairo-dock/cairo-dock/cairo-dock-dock-facility.h
include/cairo-dock/cairo-dock/cairo-dock-dock-factory.h
include/cairo-dock/cairo-dock/cairo-dock-dock-manager.h

include/cairo-dock/cairo-dock/cairo-dock-emblem.h
include/cairo-dock/cairo-dock/cairo-dock-file-manager.h
include/cairo-dock/cairo-dock/cairo-dock-flying-container.h
include/cairo-dock/cairo-dock/cairo-dock-gauge.h
include/cairo-dock/cairo-dock/cairo-dock-global-variables.h
include/cairo-dock/cairo-dock/cairo-dock-graph.h
include/cairo-dock/cairo-dock/cairo-dock-gui-factory.h
include/cairo-dock/cairo-dock/cairo-dock-gui-launcher.h
include/cairo-dock/cairo-dock/cairo-dock-gui-manager.h
include/cairo-dock/cairo-dock/cairo-dock-icon-loader.h
include/cairo-dock/cairo-dock/cairo-dock-icons.h
include/cairo-dock/cairo-dock/cairo-dock-indicator-manager.h
include/cairo-dock/cairo-dock/cairo-dock-internal-accessibility.h
include/cairo-dock/cairo-dock/cairo-dock-internal-background.h
include/cairo-dock/cairo-dock/cairo-dock-internal-desklets.h
include/cairo-dock/cairo-dock/cairo-dock-internal-dialogs.h
include/cairo-dock/cairo-dock/cairo-dock-internal-hidden-dock.h
include/cairo-dock/cairo-dock/cairo-dock-internal-icons.h
include/cairo-dock/cairo-dock/cairo-dock-internal-indicators.h
include/cairo-dock/cairo-dock/cairo-dock-internal-labels.h

include/cairo-dock/cairo-dock/cairo-dock-internal-views.h
include/cairo-dock/cairo-dock/cairo-dock-keybinder.h
include/cairo-dock/cairo-dock/cairo-dock-keyfile-utilities.h
include/cairo-dock/cairo-dock/cairo-dock-launcher-manager.h
include/cairo-dock/cairo-dock/cairo-dock-load.h
include/cairo-dock/cairo-dock/cairo-dock-log.h
include/cairo-dock/cairo-dock/cairo-dock-menu.h
include/cairo-dock/cairo-dock/cairo-dock-modules.h
include/cairo-dock/cairo-dock/cairo-dock-notifications.h
include/cairo-dock/cairo-dock/cairo-dock-opengl-font.h
include/cairo-dock/cairo-dock/cairo-dock-opengl-path.h
include/cairo-dock/cairo-dock/cairo-dock-opengl.h
include/cairo-dock/cairo-dock/cairo-dock-packages.h
include/cairo-dock/cairo-dock/cairo-dock-particle-system.h
include/cairo-dock/cairo-dock/cairo-dock-separator-manager.h
include/cairo-dock/cairo-dock/cairo-dock-separator-factory.h
include/cairo-dock/cairo-dock/cairo-dock-struct.h
include/cairo-dock/cairo-dock/cairo-dock-surface-factory.h
include/cairo-dock/cairo-dock/cairo-dock-task.h
include/cairo-dock/cairo-dock/cairo-dock-themes-manager.h
include/cairo-dock/icon-factory/cairo-dock-applet-factory.h
include/cairo-dock/icon-factory/cairo-dock-application-factory.h
include/cairo-dock/icon-factory/cairo-dock-desktop-file-factory.h
include/cairo-dock/icon-factory/cairo-dock-launcher-factory.h
include/cairo-dock/icon-factory/cairo-dock-separator-factory.h
include/cairo-dock/implementations/cairo-dock-gauge.h
include/cairo-dock/implementations/cairo-dock-graph.h
lib/libgldi.so
lib/libgldi.so.2
lib/libgldi.so.2.2.0-4
lib/pkgconfig/cairo-dock.pc
lib/pkgconfig/gldi.pc
share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo
share/locale/be/LC_MESSAGES/cairo-dock.mo
share/locale/cs/LC_MESSAGES/cairo-dock.mo
share/locale/en/LC_MESSAGES/cairo-dock.mo
share/locale/eu/LC_MESSAGES/cairo-dock.mo
share/locale/hu/LC_MESSAGES/cairo-dock.mo
share/locale/uk/LC_MESSAGES/cairo-dock.mo
share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo
share/applications/cairo-dock-cairo.desktop
share/applications/cairo-dock.desktop
share/man/man1/cairo-dock.1.gz
%%DATADIR%%/ChangeLog.txt
%%DATADIR%%/box-back.png
%%DATADIR%%/box-front.png
%%DATADIR%%/cairo-dock-animated.xpm
%%DATADIR%%/cairo-dock-cancel.svg
%%DATADIR%%/cairo-dock-logo.png
%%DATADIR%%/cairo-dock-ok.svg
%%DATADIR%%/cairo-dock-simple.conf
%%DATADIR%%/cairo-dock.conf
%%DATADIR%%/cairo-dock.svg
%%DATADIR%%/container.desktop
%%DATADIR%%/default-class-indicator.svg
%%DATADIR%%/default-icon-appli.svg
%%DATADIR%%/default-icon.svg
%%DATADIR%%/default-indicator.png
%%DATADIR%%/depth-rotate-desklet.svg
%%DATADIR%%/emblems/broken.svg
%%DATADIR%%/emblems/charge.svg
%%DATADIR%%/emblems/drop.svg
%%DATADIR%%/emblems/error.svg
%%DATADIR%%/emblems/locked.svg
%%DATADIR%%/emblems/pause.svg
%%DATADIR%%/emblems/play.svg
%%DATADIR%%/emblems/stop.svg
%%DATADIR%%/emblems/warning.svg
%%DATADIR%%/explosion/explosion.png
%%DATADIR%%/file.conf
%%DATADIR%%/gauges/Battery/background.svg
%%DATADIR%%/gauges/Battery/battery0.svg
%%DATADIR%%/gauges/Battery/battery1.svg

%%DATADIR%%/gauges/Turbo-night-fuel/theme.xml
%%DATADIR%%/hand.svg
%%DATADIR%%/help.conf
%%DATADIR%%/help_scripts.sh
%%DATADIR%%/icon-accessories.svg
%%DATADIR%%/icon-all.svg
%%DATADIR%%/icon-appearance.svg
%%DATADIR%%/icon-background.svg
%%DATADIR%%/icon-behavior.svg
%%DATADIR%%/icon-bubble.png
%%DATADIR%%/icon-buttons.png
%%DATADIR%%/icon-close.png
%%DATADIR%%/icon-connection.svg
%%DATADIR%%/icon-controler.svg
%%DATADIR%%/icon-desklets.png
%%DATADIR%%/icon-desktop.svg
%%DATADIR%%/icon-dialogs.svg
%%DATADIR%%/icon-extensions.svg
%%DATADIR%%/icon-files.svg
%%DATADIR%%/icon-frame.png
%%DATADIR%%/icon-fun.svg
%%DATADIR%%/icon-gradation.png
%%DATADIR%%/icon-help.svg
%%DATADIR%%/icon-hidden-dock.svg
%%DATADIR%%/icon-icons.svg
%%DATADIR%%/icon-indicators.svg
%%DATADIR%%/icon-internet.svg
%%DATADIR%%/icon-labels.svg
%%DATADIR%%/icon-lock-icons.svg
%%DATADIR%%/icon-maximize.png
%%DATADIR%%/icon-minimize.png
%%DATADIR%%/icon-mouse.svg
%%DATADIR%%/icon-movment.png
%%DATADIR%%/icon-plug-ins.svg
%%DATADIR%%/icon-position.svg
%%DATADIR%%/icon-restore.png
%%DATADIR%%/icon-subdock.png
%%DATADIR%%/icon-system.svg
%%DATADIR%%/icon-taskbar.png
%%DATADIR%%/icon-views.svg
%%DATADIR%%/icon-visibility.svg
%%DATADIR%%/icon-wave.png
%%DATADIR%%/launcher.desktop
%%DATADIR%%/icon-close.png
%%DATADIR%%/icon-help.png
%%DATADIR%%/icon-plug-ins.png
%%DATADIR%%/icon-accessories.png
%%DATADIR%%/icon-connection.svg
%%DATADIR%%/icon-icons.png
%%DATADIR%%/icon-restore.png
%%DATADIR%%/icon-appearance.svg
%%DATADIR%%/icon-controler.png
%%DATADIR%%/icon-maximize.png
%%DATADIR%%/icon-views.png
%%DATADIR%%/icon-behavior.svg
%%DATADIR%%/icon-desktop.svg
%%DATADIR%%/icon-minimize.png
%%DATADIR%%/icon-visibility.png
%%DATADIR%%/launcher.conf
%%DATADIR%%/main-dock.conf
%%DATADIR%%/no-input-desklet.png
%%DATADIR%%/preview-default.png
%%DATADIR%%/readme-default-view
%%DATADIR%%/retach-desklet.svg
%%DATADIR%%/rotate-desklet.svg
%%DATADIR%%/separator.desktop
%%DATADIR%%/themes.conf
%%DATADIR%%/themes/_default_/active.png
%%DATADIR%%/themes/_default_/bg.svg
%%DATADIR%%/themes/_default_/cairo-dock-cancel.svg
%%DATADIR%%/themes/_default_/cairo-dock-ok.svg
%%DATADIR%%/themes/_default_/cairo-dock.conf
%%DATADIR%%/themes/_default_/icons/logout.png
%%DATADIR%%/themes/_default_/icons/firefox.svg
%%DATADIR%%/themes/_default_/indicator.png
%%DATADIR%%/themes/_default_/launchers/01container.desktop
%%DATADIR%%/themes/_default_/launchers/01empathy.desktop
%%DATADIR%%/themes/_default_/launchers/01f-spot.desktop
%%DATADIR%%/themes/_default_/launchers/01firefox.desktop
%%DATADIR%%/themes/_default_/launchers/01gcalctool.desktop
%%DATADIR%%/themes/_default_/launchers/01gimp.desktop
%%DATADIR%%/themes/_default_/launchers/01gnome-terminal.desktop
%%DATADIR%%/themes/_default_/launchers/01inkscape.desktop
%%DATADIR%%/themes/_default_/plug-ins/Animated-icons/Animated-icons.conf
%%DATADIR%%/themes/_default_/plug-ins/Clipper/Clipper.conf
%%DATADIR%%/themes/_default_/plug-ins/Dbus/Dbus.conf
%%DATADIR%%/themes/_default_/plug-ins/GMenu/GMenu.conf
%%DATADIR%%/themes/_default_/plug-ins/clock/clock.conf
%%DATADIR%%/themes/_default_/plug-ins/dialog-rendering/dialog-rendering.conf
%%DATADIR%%/themes/_default_/plug-ins/dnd2share/dnd2share.conf
%%DATADIR%%/themes/_default_/plug-ins/icon-effect/icon-effect.conf
%%DATADIR%%/themes/_default_/plug-ins/illusion/illusion.conf
%%DATADIR%%/themes/_default_/plug-ins/logout/logout.conf
%%DATADIR%%/themes/_default_/plug-ins/musicPlayer/musicPlayer.conf
%%DATADIR%%/themes/_default_/plug-ins/quick-browser/quick-browser.conf
%%DATADIR%%/themes/_default_/plug-ins/rendering/rendering.conf
%%DATADIR%%/themes/_default_/plug-ins/shortcuts/shortcuts.conf
%%DATADIR%%/themes/_default_/plug-ins/showDesktop/showDesktop.conf
%%DATADIR%%/themes/_default_/plug-ins/stack/stack.conf
%%DATADIR%%/themes/_default_/plug-ins/switcher/switcher.conf
share/locale/ar/LC_MESSAGES/cairo-dock.mo
share/locale/be/LC_MESSAGES/cairo-dock.mo
share/locale/ca/LC_MESSAGES/cairo-dock.mo
share/locale/cs/LC_MESSAGES/cairo-dock.mo
share/locale/de/LC_MESSAGES/cairo-dock.mo
share/locale/el/LC_MESSAGES/cairo-dock.mo
share/locale/en/LC_MESSAGES/cairo-dock.mo
share/locale/es/LC_MESSAGES/cairo-dock.mo
share/locale/et/LC_MESSAGES/cairo-dock.mo
share/locale/eu/LC_MESSAGES/cairo-dock.mo
share/locale/fi/LC_MESSAGES/cairo-dock.mo
share/locale/fo/LC_MESSAGES/cairo-dock.mo
share/locale/fr/LC_MESSAGES/cairo-dock.mo
share/locale/hu/LC_MESSAGES/cairo-dock.mo
share/locale/it/LC_MESSAGES/cairo-dock.mo
share/locale/ja/LC_MESSAGES/cairo-dock.mo
share/locale/nb/LC_MESSAGES/cairo-dock.mo
share/locale/nl/LC_MESSAGES/cairo-dock.mo
share/locale/oc/LC_MESSAGES/cairo-dock.mo
share/locale/pt/LC_MESSAGES/cairo-dock.mo
share/locale/pt_BR/LC_MESSAGES/cairo-dock.mo
share/locale/ru/LC_MESSAGES/cairo-dock.mo
share/locale/sk/LC_MESSAGES/cairo-dock.mo
share/locale/sr/LC_MESSAGES/cairo-dock.mo
share/locale/sv/LC_MESSAGES/cairo-dock.mo
share/locale/tr/LC_MESSAGES/cairo-dock.mo
share/locale/uk/LC_MESSAGES/cairo-dock.mo
share/locale/vi/LC_MESSAGES/cairo-dock.mo
share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo
share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo
share/pixmaps/cairo-dock.svg
@dirrm include/cairo-dock/cairo-dock
@dirrm include/cairo-dock
@dirrm %%DATADIR%%/emblems
@dirrm %%DATADIR%%/explosion
@dirrm %%DATADIR%%/gauges/Battery
@dirrm %%DATADIR%%/gauges/Turbo-night-fuel
@dirrm %%DATADIR%%/gauges
@dirrm %%DATADIR%%/themes/_default_/icons
@dirrm %%DATADIR%%/themes/_default_/launchers
@dirrm %%DATADIR%%/themes/_default_/plug-ins/Animated-icons
@dirrm %%DATADIR%%/themes/_default_/plug-ins/GMenu
@dirrm %%DATADIR%%/themes/_default_/plug-ins/clock
@dirrm %%DATADIR%%/themes/_default_/plug-ins/dialog-rendering
@dirrm %%DATADIR%%/themes/_default_/plug-ins/dustbin
@dirrm %%DATADIR%%/themes/_default_/plug-ins/icon-effect
@dirrm %%DATADIR%%/themes/_default_/plug-ins/illusion
@dirrm %%DATADIR%%/themes/_default_/plug-ins/logout
@dirrm %%DATADIR%%/themes/_default_/plug-ins/rendering
@dirrm %%DATADIR%%/themes/_default_/plug-ins/shortcuts
@dirrm %%DATADIR%%/themes/_default_/plug-ins/showDesktop
@dirrm %%DATADIR%%/themes/_default_/plug-ins/switcher
@dirrm %%DATADIR%%/themes/_default_/plug-ins/stack
@dirrm %%DATADIR%%/themes/_default_/plug-ins/showDesktop
@dirrm %%DATADIR%%/themes/_default_/plug-ins/shortcuts
@dirrm %%DATADIR%%/themes/_default_/plug-ins/rendering
@dirrm %%DATADIR%%/themes/_default_/plug-ins/quick-browser
@dirrm %%DATADIR%%/themes/_default_/plug-ins/musicPlayer
@dirrm %%DATADIR%%/themes/_default_/plug-ins/logout
@dirrm %%DATADIR%%/themes/_default_/plug-ins/illusion
@dirrm %%DATADIR%%/themes/_default_/plug-ins/icon-effect
@dirrm %%DATADIR%%/themes/_default_/plug-ins/dnd2share
@dirrm %%DATADIR%%/themes/_default_/plug-ins/dialog-rendering
@dirrm %%DATADIR%%/themes/_default_/plug-ins/GMenu
@dirrm %%DATADIR%%/themes/_default_/plug-ins/Dbus
@dirrm %%DATADIR%%/themes/_default_/plug-ins/Clipper
@dirrm %%DATADIR%%/themes/_default_/plug-ins/Animated-icons
@dirrm %%DATADIR%%/themes/_default_/plug-ins
@dirrm %%DATADIR%%/themes/_default_/launchers
@dirrm %%DATADIR%%/themes/_default_
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%/gauges/Turbo-night-fuel
@dirrm %%DATADIR%%/gauges/Battery
@dirrm %%DATADIR%%/gauges
@dirrm %%DATADIR%%/explosion
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrmtry share/locale/fo/LC_MESSAGES
@dirrmtry share/locale/fo
@dirrmtry share/man/man1
@dirrmtry share/man
@dirrmtry lib/pkgconfig
@dirrm include/cairo-dock/implementations
@dirrm include/cairo-dock/icon-factory
@dirrm include/cairo-dock/cairo-dock
@dirrm include/cairo-dock

Return to bug 153784

Lines 1-19 Link Here

(-)Makefile (-8 / +10 lines)
1	# New ports collection makefile for: cairo-dock	1	# New ports collection makefile for: cairo-dock
2	# Date created: 2010-03-18	2	# Date created: 2011-01-06
3	# Whom: Ivan Klymenko <fidaj@ukr.net>	3	# Whom: Ivan Klymenko <fidaj@ukr.net>
4	#	4	#
5	# $FreeBSD: ports/deskutils/cairo-dock/Makefile,v 1.4 2010/07/12 03:05:49 miwi Exp $	5	# $FreeBSD: ports/deskutils/cairo-dock/Makefile,v 1.4 2010/07/12 03:05:49 miwi Exp $
6	#	6	#
7		7
8	PORTNAME= cairo-dock	8	PORTNAME= cairo-dock
9	DISTVERSION= 2.1.3-9	9	DISTVERSION= 2.2.0-4
10	CATEGORIES= deskutils	10	CATEGORIES= deskutils
11	MASTER_SITES= http://launchpadlibrarian.net/44930527/	11	MASTER_SITES= http://launchpadlibrarian.net/56954298/
12		12
13	MAINTAINER= fidaj@ukr.net	13	MAINTAINER= fidaj@ukr.net
14	COMMENT= Cairo-Dock is a light and eye-candy dock	14	COMMENT= Cairo-Dock is a light and eye-candy dock
15		15
16	LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \	16	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl
		17
		18	LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
		19	curl.6:${PORTSDIR}/ftp/curl \
17	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \	20	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
18	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext	21	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
19		22
Lines 22-35 USE_GETTEXT= yes Link Here
22	USE_GMAKE= yes	25	USE_GMAKE= yes
23	USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2	26	USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2
24	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
25	USE_XORG= xrender	28	USE_XORG= xrender xtst
		29	USE_CMAKE= yes
26	MAKE_JOBS_SAFE= yes	30	MAKE_JOBS_SAFE= yes
27		31
28	post-patch:	32	post-patch:
29	${REINPLACE_CMD} -e 's,curl,fetch,g' ${WRKSRC}/po/*.po \
30	${WRKSRC}/data/help.conf
31	${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \	33	${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
32	${WRKSRC}/src/cairo-dock-gui-factory.c	34	${WRKSRC}/src/gldit/cairo-dock-gui-factory.c
33		35
34	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
35		37

Removed Link Here

(-)files/patch-configure (-13 lines)
1	--- configure.orig 2010-05-05 18:36:30.000000000 +0300
2	+++ configure 2010-05-05 18:36:48.000000000 +0300
3	@@ -13091,8 +13091,8 @@
4	fi
5
6	if test "$LIBCRYPT_LIBS" != "" ; then
7	- HAVE_LIBCRYPT_TRUE=
8	- HAVE_LIBCRYPT_FALSE='#'
9	+ HAVE_LIBCRYPT_TRUE='#'
10	+ HAVE_LIBCRYPT_FALSE=
11	else
12	HAVE_LIBCRYPT_TRUE='#'
13	HAVE_LIBCRYPT_FALSE=

Lines 1-33 Link Here

(-)files/patch-fetch (-27 / +5 lines)
1	--- cairo-dock-package-theme 2010-02-13 11:55:45.000000000 +0100	1	--- cairo-dock-package-theme.orig 2010-12-11 01:37:14.000000000 +0200
2	+++ cairo-dock-package-theme 2010-06-28 18:48:36.000000000 +0200	2	+++ cairo-dock-package-theme 2010-12-11 01:37:33.000000000 +0200
3	@@ -1,3 +1,3 @@	3	@@ -125,7 +125,7 @@
4	-#!/bin/bash	4	if test "x${theme}" != "x"; then
5	+#!/bin/sh
6
7	# Packager for Cairo-Dock
8	@@ -126,5 +126,5 @@
9	#\__________ On cherche si ce theme est un theme officiel ou non.	5	#\__________ On cherche si ce theme est un theme officiel ou non.
10	echo "un theme est present ($theme)"	6	echo "un theme est present ($theme)"
11	- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30	7	- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
12	+ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"	8	+ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
13	if test -f "liste.tmp" ; then	9	if test -f "liste.tmp" ; then
14	grep "^\[${theme}\]" "liste.tmp"	10	grep "^\[${theme}\]" "liste.tmp"
15	--- src/cairo-dock-themes-manager.c 2010-04-03 14:32:50.000000000 +0200	11	if test "$?" != "0" -a "$theme" != "Classic" -a "$theme" != "default"; then # pas un theme officiel
16	+++ src/cairo-dock-themes-manager.c 2010-06-28 18:47:19.000000000 +0200
17	@@ -143,8 +143,16 @@
18	//\_______________ On lance le download.
19	//gchar *cCommand = g_strdup_printf ("%s wget \"%s/%s/%s\" -O \"%s\" -t %d -T %d%s", (iShowActivity == 2 ? "$TERM -e '" : ""), cServerAdress, cDistantFilePath, cDistantFileName, cTmpFilePath, CAIRO_DOCK_DL_NB_RETRY, CAIRO_DOCK_DL_TIMEOUT, (iShowActivity == 2 ? "'" : ""));
20	+#if defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__DragonFlyBSD__)
21	+ gchar *cCommand = g_strdup_printf ("/usr/bin/fetch -qo \"%s\" -T %d \"%s/%s/%s\"",
22	+ cTmpFilePath,
23	+ cServerAdress, cDistantFilePath, cDistantFileName,
24	+ mySystem.iConnectionTimeout);
25	+ cd_debug ("download with 'MaxTime' and 'NbRetries' parameters ignored with fetch(1)");
26	+#else
27	gchar *cCommand = g_strdup_printf ("curl -s \"%s/%s/%s\" --output \"%s\" --connect-timeout %d --max-time %d --retry %d",
28	cServerAdress, cDistantFilePath, cDistantFileName,
29	cTmpFilePath,
30	mySystem.iConnectionTimeout, mySystem.iConnectiontMaxTime, mySystem.iConnectiontNbRetries);
31	+#endif
32	cd_debug ("download with '%s'", cCommand);
33	int r = system (cCommand);