From owner-svn-ports-all@freebsd.org Wed Sep 7 16:40:33 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6AEFABCBCF5; Wed, 7 Sep 2016 16:40:33 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22D11E4; Wed, 7 Sep 2016 16:40:33 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87GeWFp071889; Wed, 7 Sep 2016 16:40:32 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87GeWv5071888; Wed, 7 Sep 2016 16:40:32 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609071640.u87GeWv5071888@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 7 Sep 2016 16:40:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421513 - head/databases/gtksql X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 16:40:33 -0000 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 +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 \