- Update to 0.7.6

- Move to LOCALBASE
- Change USE_WX to 2.6+
- Add FIREBIRD option. it works with firebird2 too

PR:		ports/109585
Approved by:	Denis Barov <dindin_ at __dindin.ru> (maintainer)

4 files changed, 23 insertions, 12 deletions

diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 075451f9a466..040fa3795a84 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flamerobin
-PORTVERSION=	0.7.5
+PORTVERSION=	0.7.6
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,23 +15,30 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	dindin@FreeBSD.org.ua
 COMMENT=	The GUI administration tool for firebird database
 
-LIB_DEPENDS=	fbclient.1:${PORTSDIR}/databases/firebird-client
-
-USE_WX=		2.6
+USE_XLIB=	yes
+USE_WX=		2.6+
 WX_COMPS=	wx contrib
 WX_CONF_ARGS=	absolute
 WX_PREMK=	yes
 WX_UNICODE=	yes
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+OPTIONS=	FIREBIRD "Use firebird1 instead of firebird2"	off
 
 SUB_FILES=	pkg-message
 MAN1=		flamerobin.1
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_FIREBIRD)
+LIB_DEPENDS+=	fbclient.1:${PORTSDIR}/databases/firebird-client
+.else
+LIB_DEPENDS+=	fbclient.2:${PORTSDIR}/databases/firebird2-client
+.endif
+
 .if exists(${WX_CONFIG})
 WX_VER_STR!=	${WX_CONFIG} --release
 PLIST_SUB+=	WX_VERSION=${WX_VER_STR}
diff --git a/databases/flamerobin/distinfo b/databases/flamerobin/distinfo
index 31f09a5a5029..360ae9f8627a 100644
--- a/databases/flamerobin/distinfo
+++ b/databases/flamerobin/distinfo
@@ -1,3 +1,3 @@
-MD5 (flamerobin-0.7.5-src.tar.gz) = f7be54b5a70bee15e158cb732c1fbb3d
-SHA256 (flamerobin-0.7.5-src.tar.gz) = 5cf69736df816d0b37f580dec4e8db4f45578f5ef589e74c71017dccf9ad612e
-SIZE (flamerobin-0.7.5-src.tar.gz) = 771880
+MD5 (flamerobin-0.7.6-src.tar.gz) = 8ef6c222b162a0e2b24ee8b54380491c
+SHA256 (flamerobin-0.7.6-src.tar.gz) = 2e73a2e0ca2b01835b03b97e8ad30efe9bb939701092af8d7b2f5d203a683db9
+SIZE (flamerobin-0.7.6-src.tar.gz) = 778733
diff --git a/databases/flamerobin/files/pkg-message.in b/databases/flamerobin/files/pkg-message.in
index c3ae53846308..f5bf3b466848 100644
--- a/databases/flamerobin/files/pkg-message.in
+++ b/databases/flamerobin/files/pkg-message.in
@@ -1,9 +1,9 @@
-***********************************************************************
-*                             INSTALL COMPLETE                        *
-***********************************************************************
+###############################################################################
+
+FlameRobin was installed
 
 For additonal documentation read manpage flamerobin(1) and docs in 
 %%PREFIX%%/share/flamerobin/docs/ . Also you can view same docs from
 flamerobin's help menu.
 
-***********************************************************************
+###############################################################################
diff --git a/databases/flamerobin/pkg-plist b/databases/flamerobin/pkg-plist
index f1ccdc0cf53b..cf99eae9cbf8 100644
--- a/databases/flamerobin/pkg-plist
+++ b/databases/flamerobin/pkg-plist
@@ -34,7 +34,11 @@ bin/flamerobin
 %%DATADIR%%/html-templates/ok2.png
 %%DATADIR%%/html-templates/redx.png
 %%DATADIR%%/html-templates/view.png
+share/applications/flamerobin.desktop
+share/pixmaps/flamerobin.png
 @dirrm %%DATADIR%%/html-templates
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/conf-defs
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/pixmaps