aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-04-15 13:34:55 +0800
committermarcus <marcus@FreeBSD.org>2003-04-15 13:34:55 +0800
commitdcebed9544342270284151c404e8a3446a0f3061 (patch)
tree6768369553cc64f9057bd85a11a19c5026c74291
parent9019bf509403f2bc9adf64a9417afb96ae40550d (diff)
downloadfreebsd-ports-gnome-dcebed9544342270284151c404e8a3446a0f3061.tar.gz
freebsd-ports-gnome-dcebed9544342270284151c404e8a3446a0f3061.tar.zst
freebsd-ports-gnome-dcebed9544342270284151c404e8a3446a0f3061.zip
Attempt to fix build with GNOME 2. This isn't perfect, but it should solve
the build problems people have been seeing. Reported by: Fredrick Nilsson <fredrick.nilsson@framfab.se>
-rw-r--r--databases/mdbtools/Makefile9
-rw-r--r--databases/mdbtools/files/patch-src_sql_parser.y10
2 files changed, 13 insertions, 6 deletions
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index da0ff3b93180..4fd2f1618acc 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mdbtools
PORTVERSION= 0.5
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,8 +18,8 @@ COMMENT= Utilities and libraries to export data from MS Access databases (.mdb)
BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk # To build man-pages
USE_REINPLACE= yes
-USE_GNOMENG= yes
-USE_GNOME= glib12
+USE_BISON= yes
+USE_GNOME= glib20
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
@@ -26,10 +27,6 @@ DOCS= AUTHORS ChangeLog HACKING NEWS README TODO
MAN1= mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1
post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
- -e "s|glib-config|${GLIB_CONFIG}|g" \
- -e "s|@GLIB_CFLAGS@|`${GLIB_CONFIG} --cflags`|g" \
- -e "s|@GLIB_LIBS@|`${GLIB_CONFIG} --libs`|g"
${REINPLACE_CMD} -e 's|$$(srcdir)/$$<|$$(srcdir)/$$>|g' ${WRKSRC}/doc/Makefile.in
.if !defined(NOPORTDOCS)
diff --git a/databases/mdbtools/files/patch-src_sql_parser.y b/databases/mdbtools/files/patch-src_sql_parser.y
new file mode 100644
index 000000000000..22c412bac3ea
--- /dev/null
+++ b/databases/mdbtools/files/patch-src_sql_parser.y
@@ -0,0 +1,10 @@
+--- src/sql/parser.y.orig Tue Apr 15 01:26:03 2003
++++ src/sql/parser.y Tue Apr 15 01:26:08 2003
+@@ -109,6 +109,7 @@
+ database:
+ PATH
+ | NAME
++ ;
+
+ table:
+ NAME { mdb_sql_add_table(_mdb_sql(NULL), $1); free($1); }