svn commit: r396815 - head/databases/mdbtools
Baptiste Daroussin
bapt at FreeBSD.org
Sun Sep 13 13:16:43 UTC 2015
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 at 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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
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
More information about the svn-ports-all
mailing list