5 files changed, 13 insertions, 42 deletions

diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index 6aa587a0ce83..b51cfc4ea59b 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	growl-for-linux
-PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTVERSION=	0.8.5
+PORTREVISION=	0
 CATEGORIES=	deskutils
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -13,7 +13,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils
 LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libdbus-glib-1.so:devel/dbus-glib
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 BROKEN_powerpc64=	fails to compile: balloon.c:160: error: nested functions are disabled, use -fnested-functions to re-enable
 
@@ -35,8 +38,9 @@ PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,}
 
 USES=		autoreconf compiler:nestedfct libtool pkgconfig sqlite:3 ssl
 USE_GITHUB=	yes
-USE_GNOME=	gtk20
-
+USE_GNOME=	cairo gdkpixbuf2 gtk20 libxml2
+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/display \
+		${PREFIX}/lib/${PORTNAME}/subscribe
 post-patch:
 	@${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \
 		${WRKSRC}/Makefile.am
diff --git a/deskutils/growl-for-linux/distinfo b/deskutils/growl-for-linux/distinfo
index e031b2355e6e..5b3bcffd0ed3 100644
--- a/deskutils/growl-for-linux/distinfo
+++ b/deskutils/growl-for-linux/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mattn-growl-for-linux-0.8.1_GH0.tar.gz) = 4762ca137277c48ba778e4652eb5ee354d726953c515a9fb0527b373fd2d4bf9
-SIZE (mattn-growl-for-linux-0.8.1_GH0.tar.gz) = 746865
+TIMESTAMP = 1500984019
+SHA256 (mattn-growl-for-linux-0.8.5_GH0.tar.gz) = 6af57c763d26e8bf985eb6ede5c2d2be9469c4f9254bdebcb168f0703dfb20fa
+SIZE (mattn-growl-for-linux-0.8.5_GH0.tar.gz) = 842940
diff --git a/deskutils/growl-for-linux/files/patch-configure.ac b/deskutils/growl-for-linux/files/patch-configure.ac
deleted file mode 100644
index f1250a736b26..000000000000
--- a/deskutils/growl-for-linux/files/patch-configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./configure.ac.orig	2012-09-01 14:59:36.000000000 +0200
-+++ ./configure.ac	2012-09-01 15:00:01.000000000 +0200
-@@ -1,5 +1,5 @@
- AC_PREREQ([2.65])
--AC_INIT([growl-for-linux], [esyscmd([cat VERSION | tr -d '\n'])], [mattn.jp@gmail.com])
-+AC_INIT([growl-for-linux], esyscmd([tr -d '\n' < VERSION]), [mattn.jp@gmail.com])
- AC_CONFIG_SRCDIR([gol.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
diff --git a/deskutils/growl-for-linux/files/patch-gol.c b/deskutils/growl-for-linux/files/patch-gol.c
deleted file mode 100644
index b4a722cf3715..000000000000
--- a/deskutils/growl-for-linux/files/patch-gol.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- gol.c.orig	2014-05-20 03:11:04.000000000 +0200
-+++ gol.c	2015-02-28 20:05:59.171972929 +0100
-@@ -1427,18 +1427,18 @@
-             r-(ptr-top)-6, &aeskey, (unsigned char*) iv, AES_DECRYPT);
-       }
-       else if (!strcmp(crypt_algorythm, "DES")) {
--        des_key_schedule schedule;
-+        DES_key_schedule schedule;
-         DES_set_key_unchecked((const_DES_cblock*) &digest, &schedule);
-         DES_ncbc_encrypt((unsigned char*) ptr, (unsigned char*) data,
-             r-(ptr-top)-6, &schedule, (const_DES_cblock*) &iv, DES_DECRYPT);
-       }
-       else if (!strcmp(crypt_algorythm, "3DES")) {
--        des_key_schedule schedule1, schedule2, schedule3;
-+        DES_key_schedule schedule1, schedule2, schedule3;
-         DES_set_key_unchecked((const_DES_cblock*) (digest+ 0), &schedule1);
-         DES_set_key_unchecked((const_DES_cblock*) (digest+ 8), &schedule2);
-         DES_set_key_unchecked((const_DES_cblock*) (digest+16), &schedule3);
--        des_ede3_cbc_encrypt((unsigned char*) ptr, (unsigned char*) data,
--            r-(ptr-top)-6, schedule1, schedule2, schedule3,
-+        DES_ede3_cbc_encrypt((unsigned char*) ptr, (unsigned char*) data,
-+            r-(ptr-top)-6, &schedule1, &schedule2, &schedule3,
-             (const_DES_cblock*) &iv, DES_DECRYPT);
-       } else {
-         data = strdup(ptr);
diff --git a/deskutils/growl-for-linux/pkg-plist b/deskutils/growl-for-linux/pkg-plist
index 543f2312982b..807538f69e49 100644
--- a/deskutils/growl-for-linux/pkg-plist
+++ b/deskutils/growl-for-linux/pkg-plist
@@ -24,7 +24,7 @@ lib/growl-for-linux/subscribe/libtweets.so
 lib/growl-for-linux/subscribe/libtweets.so.0
 lib/growl-for-linux/subscribe/libtweets.so.0.0.0
 %%DESKTOPDIR%%/gol.desktop
-%%DATADIR%%/data/growl4linux.jpg
 %%DATADIR%%/data/icon.png
+%%DATADIR%%/data/icon256.png
 %%DATADIR%%/data/icon_dnd.png
 %%DATADIR%%/data/mattn.png