diff -urN cairo-dock-orig/Makefile cairo-dock/Makefile --- cairo-dock-orig/Makefile 2010-03-28 09:32:21.000000000 +0300 +++ cairo-dock/Makefile 2010-06-01 10:35:48.000000000 +0300 @@ -1,28 +1,41 @@ # New ports collection makefile for: cairo-dock -# Date created: 2010-03-18 +# Date created: 2010-06-01 # Whom: Ivan Klymenko # # $FreeBSD: ports/deskutils/cairo-dock/Makefile,v 1.2 2010/03/28 06:32:21 dinoex Exp $ # PORTNAME= cairo-dock -DISTVERSION= 2.1.0 +DISTVERSION= 2.1.3 PORTREVISION= 1 CATEGORIES= deskutils -MASTER_SITES= BERLIOS +MASTER_SITES= http://launchpadlibrarian.net/44930527/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-9 MAINTAINER= fidaj@ukr.net COMMENT= Cairo-Dock is a light and eye-candy dock -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ +RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget + +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext GNU_CONFIGURE= yes -USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_XORG= xrender -.include +.include + +.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) +# Glitz support can only be enabled if cairo is built with glitz support +CONFIGURE_ARGS+= --enable-glitz +LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz +.else +CONFIGURE_ARGS+= --disable-glitz +.endif + +.include diff -urN cairo-dock-orig/distinfo cairo-dock/distinfo --- cairo-dock-orig/distinfo 2010-03-16 23:37:14.000000000 +0200 +++ cairo-dock/distinfo 2010-05-05 18:10:19.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (cairo-dock-2.1.0.tar.bz2) = 242b1d4cc6cf9743771ca1752ad342c7 -SHA256 (cairo-dock-2.1.0.tar.bz2) = f06d84f9aa8979e352ce62ef3d80747ea05803bd671ae53cc1e92db5ad0c8389 -SIZE (cairo-dock-2.1.0.tar.bz2) = 1375614 +MD5 (cairo-dock-2.1.3-9.tar.gz) = f4b7f78770696b36efaa346df0bfa7d2 +SHA256 (cairo-dock-2.1.3-9.tar.gz) = 0629ffc55a5c075daa74908627ad5a69315c3af22051458ec9489ed64d382ae5 +SIZE (cairo-dock-2.1.3-9.tar.gz) = 2480328 diff -urN cairo-dock-orig/files/patch-Makefile.am cairo-dock/files/patch-Makefile.am --- cairo-dock-orig/files/patch-Makefile.am 2010-03-16 23:37:14.000000000 +0200 +++ cairo-dock/files/patch-Makefile.am 2010-05-05 18:35:31.000000000 +0300 @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2010-02-03 23:18:44.000000000 +0200 -+++ src/Makefile.am 2010-02-03 23:18:54.000000000 +0200 -@@ -45,8 +45,6 @@ +--- src/Makefile.am.orig 2010-05-05 18:34:05.000000000 +0300 ++++ src/Makefile.am 2010-05-05 18:34:23.000000000 +0300 +@@ -46,8 +46,6 @@ -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ -DGL_GLEXT_PROTOTYPES=\""1"\"\ -std=c99\ diff -urN cairo-dock-orig/files/patch-Makefile.in cairo-dock/files/patch-Makefile.in --- cairo-dock-orig/files/patch-Makefile.in 2010-03-16 23:37:14.000000000 +0200 +++ cairo-dock/files/patch-Makefile.in 2010-05-05 18:35:41.000000000 +0300 @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2010-02-03 23:18:44.000000000 +0200 -+++ src/Makefile.in 2010-02-03 23:19:01.000000000 +0200 -@@ -350,8 +350,6 @@ +--- src/Makefile.in.orig 2010-05-05 18:34:41.000000000 +0300 ++++ src/Makefile.in 2010-05-05 18:34:46.000000000 +0300 +@@ -378,8 +378,6 @@ -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ -DGL_GLEXT_PROTOTYPES=\""1"\"\ -std=c99\ diff -urN cairo-dock-orig/files/patch-cairo-dock-package-theme cairo-dock/files/patch-cairo-dock-package-theme --- cairo-dock-orig/files/patch-cairo-dock-package-theme 2010-03-26 12:43:11.000000000 +0200 +++ cairo-dock/files/patch-cairo-dock-package-theme 2010-05-05 18:47:15.000000000 +0300 @@ -1,5 +1,5 @@ ---- cairo-dock-package-theme.orig 2010-03-26 12:42:34.000000000 +0200 -+++ cairo-dock-package-theme 2010-03-26 12:42:52.000000000 +0200 +--- cairo-dock-package-theme.orig 2010-05-05 18:46:31.000000000 +0300 ++++ cairo-dock-package-theme 2010-05-05 18:46:51.000000000 +0300 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash diff -urN cairo-dock-orig/files/patch-configure cairo-dock/files/patch-configure --- cairo-dock-orig/files/patch-configure 2010-03-16 23:37:14.000000000 +0200 +++ cairo-dock/files/patch-configure 2010-05-05 18:37:12.000000000 +0300 @@ -1,9 +1,9 @@ ---- configure.orig 2010-01-31 18:18:42.000000000 +0200 -+++ configure 2010-01-31 18:18:52.000000000 +0200 -@@ -15044,8 +15044,8 @@ +--- 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 + if test "$LIBCRYPT_LIBS" != "" ; then - HAVE_LIBCRYPT_TRUE= - HAVE_LIBCRYPT_FALSE='#' + HAVE_LIBCRYPT_TRUE='#' diff -urN cairo-dock-orig/pkg-plist cairo-dock/pkg-plist --- cairo-dock-orig/pkg-plist 2010-03-16 23:37:14.000000000 +0200 +++ cairo-dock/pkg-plist 2010-05-29 15:05:52.000000000 +0300 @@ -10,6 +10,7 @@ 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-callbacks.h include/cairo-dock/cairo-dock/cairo-dock-class-manager.h @@ -32,9 +33,8 @@ 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-callbacks.h include/cairo-dock/cairo-dock/cairo-dock-gui-factory.h -include/cairo-dock/cairo-dock/cairo-dock-gui-filter.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-icons.h include/cairo-dock/cairo-dock/cairo-dock-internal-accessibility.h @@ -57,6 +57,7 @@ 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.h include/cairo-dock/cairo-dock/cairo-dock-particle-system.h include/cairo-dock/cairo-dock/cairo-dock-renderer-manager.h include/cairo-dock/cairo-dock/cairo-dock-separator-factory.h @@ -64,13 +65,9 @@ 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 -lib/libcairo-dock.a -lib/libcairo-dock.la -lib/libcairo-dock.so libdata/pkgconfig/cairo-dock.pc share/locale/de/LC_MESSAGES/cairo-dock.mo share/locale/el/LC_MESSAGES/cairo-dock.mo -share/locale/en_GB/LC_MESSAGES/cairo-dock.mo share/locale/es/LC_MESSAGES/cairo-dock.mo share/locale/fr/LC_MESSAGES/cairo-dock.mo share/locale/it/LC_MESSAGES/cairo-dock.mo @@ -81,6 +78,13 @@ share/locale/ru/LC_MESSAGES/cairo-dock.mo share/locale/sv/LC_MESSAGES/cairo-dock.mo 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 %%DATADIR%%/ChangeLog.txt @@ -126,8 +130,6 @@ %%DATADIR%%/gauges/Turbo-night-fuel/theme.xml %%DATADIR%%/hand.svg %%DATADIR%%/help.conf -%%DATADIR%%/help.svg -%%DATADIR%%/icon-accessibility.svg %%DATADIR%%/icon-background.svg %%DATADIR%%/icon-bubble.png %%DATADIR%%/icon-buttons.png @@ -136,7 +138,6 @@ %%DATADIR%%/icon-frame.png %%DATADIR%%/icon-gradation.png %%DATADIR%%/icon-hidden-dock.png -%%DATADIR%%/icon-icons.svg %%DATADIR%%/icon-indicators.png %%DATADIR%%/icon-labels.png %%DATADIR%%/icon-lock-icons.svg @@ -146,8 +147,23 @@ %%DATADIR%%/icon-subdock.png %%DATADIR%%/icon-system.png %%DATADIR%%/icon-taskbar.png -%%DATADIR%%/icon-views.svg %%DATADIR%%/icon-wave.png +%%DATADIR%%/cairo-dock-simple.conf +%%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%%/preview-default.png @@ -162,6 +178,7 @@ %%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/01firefox.desktop %%DATADIR%%/themes/_default_/launchers/01gimp.desktop