From owner-svn-ports-all@freebsd.org Sun Sep 13 13:16:43 2015 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 909E3A0313F; Sun, 13 Sep 2015 13:16:43 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 7529D112D; Sun, 13 Sep 2015 13:16:43 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8DDGh89060197; Sun, 13 Sep 2015 13:16:43 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8DDGhLV060195; Sun, 13 Sep 2015 13:16:43 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201509131316.t8DDGhLV060195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 13 Sep 2015 13:16:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396815 - head/databases/mdbtools 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.20 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: Sun, 13 Sep 2015 13:16:43 -0000 Author: bapt Date: Sun Sep 13 13:16:42 2015 New Revision: 396815 URL: https://svnweb.freebsd.org/changeset/ports/396815 Log: Make GNOME an option instead of autodetermined While here: - Use options helpers - Fix plist with GNOME Modified: head/databases/mdbtools/Makefile head/databases/mdbtools/pkg-plist Modified: head/databases/mdbtools/Makefile ============================================================================== --- head/databases/mdbtools/Makefile Sun Sep 13 12:56:49 2015 (r396814) +++ head/databases/mdbtools/Makefile Sun Sep 13 13:16:42 2015 (r396815) @@ -3,7 +3,7 @@ PORTNAME= mdbtools PORTVERSION= 0.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MAINTAINER= rhurlin@gwdg.de @@ -16,13 +16,15 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gaw txt2man:${PORTSDIR}/textproc/txt2man LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC +OPTIONS_DEFINE= GNOME DOCS +OPTIONS_SUB= yes + USES= autoreconf bison iconv libtool pathfix pkgconfig USE_GITHUB= yes GH_ACCOUNT= brianb PATHFIX_MAKEFILEIN= Makefile.am USE_LDCONFIG= yes USE_GNOME= glib20 -WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} \ --with-unixodbc=${LOCALBASE} @@ -32,25 +34,11 @@ DOCS= AUTHORS ChangeLog HACKING NEWS RE WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS_DEFINE= DOCS - -.include - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_XORG+= x11 -USE_GNOME+= gnomeprefix libgnomeui gconf2 intltool -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|$$(srcdir)/$$<|$$(srcdir)/$$>|g' \ - ${WRKSRC}/doc/Makefile.am - -post-configure: - @${REINPLACE_CMD} -e 's|^install-man:.*|install-man: install-man1|' \ - ${WRKSRC}/doc/Makefile.in +GNOME_CONFIGURE_ENABLE= gmdb2 +GNOME_USE= GNOME=gnomeprefix GNOME=libgnomeui GNOME=gconf2 GNOME=intltool -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/databases/mdbtools/pkg-plist ============================================================================== --- head/databases/mdbtools/pkg-plist Sun Sep 13 12:56:49 2015 (r396814) +++ head/databases/mdbtools/pkg-plist Sun Sep 13 13:16:42 2015 (r396815) @@ -1,4 +1,4 @@ -%%GNOME:%%bin/gmdb2 +%%GNOME%%bin/gmdb2 bin/mdb-array bin/mdb-export bin/mdb-header @@ -9,7 +9,7 @@ bin/mdb-schema bin/mdb-sql bin/mdb-tables bin/mdb-ver -%%GNOME:%%include/gmdb.h +%%GNOME%%include/gmdb.h include/mdbsql.h include/mdbtools.h include/mdbver.h @@ -44,33 +44,34 @@ libdata/pkgconfig/libmdbsql.pc %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -%%GNOME:%%share/gmdb/glade/COPYING -%%GNOME:%%share/gmdb/glade/code.xpm -%%GNOME:%%share/gmdb/glade/debug.xpm -%%GNOME:%%share/gmdb/glade/form_big.xpm -%%GNOME:%%share/gmdb/glade/forms.xpm -%%GNOME:%%share/gmdb/glade/gmdb-debug.glade -%%GNOME:%%share/gmdb/glade/gmdb-export.glade -%%GNOME:%%share/gmdb/glade/gmdb-prefs.glade -%%GNOME:%%share/gmdb/glade/gmdb-props.glade -%%GNOME:%%share/gmdb/glade/gmdb-schema.glade -%%GNOME:%%share/gmdb/glade/gmdb-sql.glade -%%GNOME:%%share/gmdb/glade/gmdb-tabledef.glade -%%GNOME:%%share/gmdb/glade/gmdb.glade -%%GNOME:%%share/gmdb/glade/logo.xpm -%%GNOME:%%share/gmdb/glade/macro_big.xpm -%%GNOME:%%share/gmdb/glade/macros.xpm -%%GNOME:%%share/gmdb/glade/module_big.xpm -%%GNOME:%%share/gmdb/glade/pk.xpm -%%GNOME:%%share/gmdb/glade/query.xpm -%%GNOME:%%share/gmdb/glade/query_big.xpm -%%GNOME:%%share/gmdb/glade/report_big.xpm -%%GNOME:%%share/gmdb/glade/reports.xpm -%%GNOME:%%share/gmdb/glade/stock_export-16.png -%%GNOME:%%share/gmdb/glade/stock_export.png -%%GNOME:%%share/gmdb/glade/table.xpm -%%GNOME:%%share/gmdb/glade/table_big.xpm -%%GNOME:%%share/gnome/help/gmdb/C/figures/gmdb2_sql_window.png -%%GNOME:%%share/gnome/help/gmdb/C/figures/gmdb2_window.png -%%GNOME:%%share/gnome/help/gmdb/C/gmdb.xml -%%GNOME:%%share/gnome/help/gmdb/C/legal.xml +%%GNOME%%share/gmdb/glade/COPYING +%%GNOME%%share/gmdb/glade/code.xpm +%%GNOME%%share/gmdb/glade/debug.xpm +%%GNOME%%share/gmdb/glade/form_big.xpm +%%GNOME%%share/gmdb/glade/forms.xpm +%%GNOME%%share/gmdb/glade/gmdb-debug.glade +%%GNOME%%share/gmdb/glade/gmdb-export.glade +%%GNOME%%share/gmdb/glade/gmdb-prefs.glade +%%GNOME%%share/gmdb/glade/gmdb-props.glade +%%GNOME%%share/gmdb/glade/gmdb-schema.glade +%%GNOME%%share/gmdb/glade/gmdb-sql.glade +%%GNOME%%share/gmdb/glade/gmdb-tabledef.glade +%%GNOME%%share/gmdb/glade/gmdb.glade +%%GNOME%%share/gmdb/glade/logo.xpm +%%GNOME%%share/gmdb/glade/macro_big.xpm +%%GNOME%%share/gmdb/glade/macros.xpm +%%GNOME%%share/gmdb/glade/module_big.xpm +%%GNOME%%share/gmdb/glade/pk.xpm +%%GNOME%%share/gmdb/glade/query.xpm +%%GNOME%%share/gmdb/glade/query_big.xpm +%%GNOME%%share/gmdb/glade/report_big.xpm +%%GNOME%%share/gmdb/glade/reports.xpm +%%GNOME%%share/gmdb/glade/stock_export-16.png +%%GNOME%%share/gmdb/glade/stock_export.png +%%GNOME%%share/gmdb/glade/table.xpm +%%GNOME%%share/gmdb/glade/table_big.xpm +%%GNOME%%share/gnome/help/gmdb/C/figures/gmdb2_sql_window.png +%%GNOME%%share/gnome/help/gmdb/C/figures/gmdb2_window.png +%%GNOME%%share/gnome/help/gmdb/C/gmdb.xml +%%GNOME%%share/gnome/help/gmdb/C/legal.xml +%%GNOME%%share/omf/mdbtools/gmdb-C.omf