Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Sep 2016 16:40:32 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421513 - head/databases/gtksql
Message-ID:  <201609071640.u87GeWv5071888@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Sep  7 16:40:32 2016
New Revision: 421513
URL: https://svnweb.freebsd.org/changeset/ports/421513

Log:
  - Add LICENSE_FILE
  - Switch to options helpers
  - Bump PORTREVISION for x11-toolkits/scintilla library change

Modified:
  head/databases/gtksql/Makefile

Modified: head/databases/gtksql/Makefile
==============================================================================
--- head/databases/gtksql/Makefile	Wed Sep  7 16:39:18 2016	(r421512)
+++ head/databases/gtksql/Makefile	Wed Sep  7 16:40:32 2016	(r421513)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtksql
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
 
@@ -11,15 +11,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical query tool for PostgreSQL/MySQL/SQLite
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-OPTIONS_DEFINE=	AVAHI DOCS
-OPTIONS_MULTI=	DB
-OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
-OPTIONS_DEFAULT=	SQLITE
-
 USES=		gettext gmake pkgconfig
 USE_GNOME=	gtk20 cairo glib20 pango
 GNU_CONFIGURE=	yes
@@ -30,30 +26,24 @@ CPPFLAGS+=	-I${LOCALBASE}/include/scinti
 LDFLAGS+=	-L${LOCALBASE}/lib -lscintilla -lscintilla_lexers
 LDFLAGS+=	-lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo
 
-PGSQL_USES=	pgsql
+OPTIONS_DEFINE=	AVAHI DOCS
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	SQLITE
+
+PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
 
-.include <bsd.port.options.mk>
+AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+AVAHI_CONFIGURE_OFF=	--without-avahi
+
+MYSQL_USES=		mysql
+MYSQL_CPPFLAGS=		-I${LOCALBASE}/include/mysql
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_CONFIGURE_OFF=	--without-mysql
 
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-common.so:net/avahi-app
-.else
-CONFIGURE_ARGS+=	--without-avahi
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include/mysql
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql
-.else
-CONFIGURE_ARGS+=	--without-mysql
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USES+=		sqlite
-.else
-CONFIGURE_ARGS+=	--without-sqlite
-.endif
+SQLITE_USES=		sqlite
+SQLITE_CONFIGURE_OFF=	--without-sqlite
 
 post-patch:
 	@${REINPLACE_CMD} -e \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071640.u87GeWv5071888>