5 files changed, 10 insertions, 40 deletions

diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 6a171072d5b7..4af67e409d56 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkjournal
-PORTVERSION=	0.3.4.pre1
+PORTVERSION=	0.3.5.b
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://linuxhelp.homeunix.com/gtkjournal/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
@@ -17,19 +17,13 @@ COMMENT=	Gtk+-2 journal/diary
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
 		sqlite:${PORTSDIR}/databases/sqlite
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_LIBTOOL_VER=13
+USE_GNOME=	gnomehack lthack
 
-PLIST_FILES=	bin/${PORTNAME}
-
-post-patch:
-	@${REINPLACE_CMD} -e "54,\$$d" ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+MAN1=		${PORTNAME}.1
 
 .include <bsd.port.mk>
diff --git a/deskutils/gtkjournal/distinfo b/deskutils/gtkjournal/distinfo
index ac162f1aef86..61aac5f85fe3 100644
--- a/deskutils/gtkjournal/distinfo
+++ b/deskutils/gtkjournal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtkjournal-0.3.4pre1.tar.bz2) = c0b349138de08c64bca3387300d37a12
-SIZE (gtkjournal-0.3.4pre1.tar.bz2) = 24045
+MD5 (gtkjournal-0.3.5b.tar.gz) = e554139af09ad1251a80c14c09dd4d82
+SIZE (gtkjournal-0.3.5b.tar.gz) = 603815
diff --git a/deskutils/gtkjournal/files/patch-Makefile b/deskutils/gtkjournal/files/patch-Makefile
deleted file mode 100644
index b5ef449d7fbe..000000000000
--- a/deskutils/gtkjournal/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	Wed Feb  4 18:17:43 2004
-+++ Makefile	Sun Feb  8 01:06:06 2004
-@@ -4,11 +4,11 @@
- ## @version: 1.0
- ##
- 
--CXX = g++
--PREFIX = /usr
-+#CXX = g++
-+#PREFIX = /usr
- INCLUDE = `pkg-config gtkmm-2.0 --cflags` -I./
--LIBS = `pkg-config gtkmm-2.0 --libs` -lcrypto -lsqlite
--CXXFLAGS = -pipe -ansi -pedantic 
-+LIBS = ${LDFLAGS} `pkg-config gtkmm-2.0 --libs` -lcrypto -lsqlite
-+CXXFLAGS = ${CFLAGS} -pipe
- SRCS = gjournal/journalfile.cpp aolib/gui/informationdialog.cpp aolib/bfcryptfile.cpp sqlitem/sqlitemanager.cpp \
- 	sqlitem/sqliteresult.cpp aolib/gui/logindialog.cpp gjournal/globals.cpp gjournal/journalwindow.cpp aolib/datefuncs.cpp main.cpp
- OBJS = gjournal/journalfile.o aolib/gui/informationdialog.o aolib/bfcryptfile.o sqlitem/sqlitemanager.o \
diff --git a/deskutils/gtkjournal/files/patch-gjournal::journalwindow.hpp b/deskutils/gtkjournal/files/patch-gjournal::journalwindow.hpp
deleted file mode 100644
index e3af3e959cf2..000000000000
--- a/deskutils/gtkjournal/files/patch-gjournal::journalwindow.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- gjournal/journalwindow.hpp.orig	Sun Feb  8 00:09:23 2004
-+++ gjournal/journalwindow.hpp	Sun Feb  8 00:09:41 2004
-@@ -19,6 +19,7 @@
- #ifndef JOURNAL_WINDOW_HPP
- #define JOURNAL_WINDOW_HPP
- 
-+#include <libgen.h>
- #include <gtkmm.h>
- #include <iostream>
- #include <map>
diff --git a/deskutils/gtkjournal/pkg-plist b/deskutils/gtkjournal/pkg-plist
new file mode 100644
index 000000000000..df274dc6debd
--- /dev/null
+++ b/deskutils/gtkjournal/pkg-plist
@@ -0,0 +1,4 @@
+bin/gtkjournal
+lib/libsqlitemm.a
+lib/libsqlitemm.so
+lib/libsqlitemm.so.0