cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No more x11/gnome/doc-utils

Browse Source 
Regen WANTLIB and fix DEPENDS.
This commit is contained in:
ajacoutot 2020-06-10 07:18:35 +00:00
parent 8f3fd719fe
commit b941e5be3c
4 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
databases/mdbtools/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2019/07/12 20:43:54 sthen Exp $ # $OpenBSD: Makefile,v 1.20 2020/06/10 07:18:35 ajacoutot Exp $
COMMENT-main = read microsoft Access MDB COMMENT-main = read microsoft Access MDB
COMMENT-gmdb = graphical interface to MDB tools COMMENT-gmdb = graphical interface to MDB tools
@ -9,8 +9,8 @@ GH_TAGNAME = 0.7.1
PKGNAME-main = ${GH_PROJECT}-${GH_TAGNAME} PKGNAME-main = ${GH_PROJECT}-${GH_TAGNAME}
PKGNAME-gmdb = gmdb-${GH_TAGNAME} PKGNAME-gmdb = gmdb-${GH_TAGNAME}
REVISION-main = 6 REVISION-main = 7
REVISION-gmdb = 7 REVISION-gmdb = 8
EPOCH = 0 EPOCH = 0
CATEGORIES = databases converters CATEGORIES = databases converters
@ -28,21 +28,10 @@ SHARED_LIBS += mdbodbcW 0.0
# GPLv2+, LGPL v2+ # GPLv2+, LGPL v2+
PERMIT_PACKAGE = Yes PERMIT_PACKAGE = Yes
WANTLIB-main += c curses glib-2.0 iconv intl iodbcinst pcre pthread WANTLIB-main += c glib-2.0 iconv iodbcinst readline
WANTLIB-main += readline
WANTLIB-gmdb += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcomposite Xcursor WANTLIB-gmdb += c gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 glib-2.0 gnome-2
WANTLIB-gmdb += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 WANTLIB-gmdb += gnomeui-2 gobject-2.0 gtk-x11-2.0 intl mdb mdbsql pango-1.0
WANTLIB-gmdb += atk-1.0 bonobo-2 bonobo-activation bonoboui-2 c cairo
WANTLIB-gmdb += canberra crypto dbus-1 dbus-glib-1 expat ffi fontconfig
WANTLIB-gmdb += freetype fribidi gailutil gconf-2 gcrypt gdk-x11-2.0
WANTLIB-gmdb += gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 gmodule-2.0
WANTLIB-gmdb += gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2
WANTLIB-gmdb += gobject-2.0 gpg-error graphite2 gthread-2.0 gtk-x11-2.0
WANTLIB-gmdb += harfbuzz iconv intl ltdl lzma m mdb mdbsql ogg pango-1.0
WANTLIB-gmdb += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt
WANTLIB-gmdb += pthread ssl util vorbis vorbisfile xcb xcb-render xcb-shm
WANTLIB-gmdb += xml2 z
BUILD_DEPENDS = devel/bison \ BUILD_DEPENDS = devel/bison \
textproc/txt2man textproc/txt2man
@ -54,7 +43,7 @@ LIB_DEPENDS-gmdb = databases/mdbtools,-main>=0.7.1v0 \
x11/gnome/libgnomeui x11/gnome/libgnomeui
RUN_DEPENDS-main = RUN_DEPENDS-main =
RUN_DEPENDS-gmdb = RUN_DEPENDS-gmdb = ${MODGNOME_RUN_DEPENDS}
YACC= bison -y YACC= bison -y
CONFIGURE_STYLE = autoreconf CONFIGURE_STYLE = autoreconf
@ -71,7 +60,7 @@ BUILD_PACKAGES := ${BUILD_PACKAGES:N-gmdb}
.if ${BUILD_PACKAGES:M-gmdb} .if ${BUILD_PACKAGES:M-gmdb}
MODULES += x11/gnome MODULES += x11/gnome
MODGNOME_TOOLS += yelp desktop-file-utils MODGNOME_TOOLS += desktop-file-utils
.else .else
CONFIGURE_ARGS += --disable-gmdb2 CONFIGURE_ARGS += --disable-gmdb2
.endif .endif

11
databases/mdbtools/patches/patch-src_gmdb2_Makefile_am Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_gmdb2_Makefile_am,v 1.1 2020/06/10 07:18:35 ajacoutot Exp $
Index: src/gmdb2/Makefile.am
--- src/gmdb2/Makefile.am.orig
+++ src/gmdb2/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = help gladefiles pixmaps
+SUBDIRS = gladefiles pixmaps
bin_PROGRAMS = gmdb2
include_HEADERS = gmdb.h

11
databases/mdbtools/pkg/PLIST-gmdb
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gmdb,v 1.3 2018/06/27 21:03:39 espie Exp $ @comment $OpenBSD: PLIST-gmdb,v 1.4 2020/06/10 07:18:36 ajacoutot Exp $
@pkgpath databases/mdbtools/snapshot,-gmdb @pkgpath databases/mdbtools/snapshot,-gmdb
@bin bin/gmdb2 @bin bin/gmdb2
include/gmdb.h include/gmdb.h
@ -32,13 +32,4 @@ share/gmdb/glade/stock_export-16.png
share/gmdb/glade/stock_export.png share/gmdb/glade/stock_export.png
share/gmdb/glade/table.xpm share/gmdb/glade/table.xpm
share/gmdb/glade/table_big.xpm share/gmdb/glade/table_big.xpm
share/gnome/
share/gnome/help/
share/gnome/help/gmdb/
share/gnome/help/gmdb/C/
share/gnome/help/gmdb/C/figures/
share/gnome/help/gmdb/C/figures/gmdb2_sql_window.png
share/gnome/help/gmdb/C/figures/gmdb2_window.png
share/gnome/help/gmdb/C/gmdb.xml
share/gnome/help/gmdb/C/legal.xml
@tag update-desktop-database @tag update-desktop-database

14
databases/mdbtools/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2018/05/15 11:08:51 espie Exp $ @comment $OpenBSD: PLIST-main,v 1.3 2020/06/10 07:18:36 ajacoutot Exp $
@pkgpath databases/mdbtools/snapshot,-main @pkgpath databases/mdbtools/snapshot,-main
@bin bin/mdb-array @bin bin/mdb-array
@bin bin/mdb-export @bin bin/mdb-export
@ -13,16 +13,16 @@
include/mdbsql.h include/mdbsql.h
include/mdbtools.h include/mdbtools.h
include/mdbver.h include/mdbver.h
lib/libmdb.a @static-lib lib/libmdb.a
lib/libmdb.la lib/libmdb.la
@lib lib/libmdb.so.${LIBmdb_VERSION} @lib lib/libmdb.so.${LIBmdb_VERSION}
lib/libmdbodbc.a @static-lib lib/libmdbodbc.a
lib/libmdbodbc.la lib/libmdbodbc.la
@lib lib/libmdbodbc.so.${LIBmdbodbc_VERSION} @lib lib/libmdbodbc.so.${LIBmdbodbc_VERSION}
lib/libmdbodbcW.a @static-lib lib/libmdbodbcW.a
lib/libmdbodbcW.la lib/libmdbodbcW.la
@lib lib/libmdbodbcW.so.${LIBmdbodbcW_VERSION} @lib lib/libmdbodbcW.so.${LIBmdbodbcW_VERSION}
lib/libmdbsql.a @static-lib lib/libmdbsql.a
lib/libmdbsql.la lib/libmdbsql.la
@lib lib/libmdbsql.so.${LIBmdbsql_VERSION} @lib lib/libmdbsql.so.${LIBmdbsql_VERSION}
lib/pkgconfig/libmdb.pc lib/pkgconfig/libmdb.pc
@ -38,7 +38,3 @@ lib/pkgconfig/libmdbsql.pc
@man man/man1/mdb-tables.1 @man man/man1/mdb-tables.1
@man man/man1/mdb-ver.1 @man man/man1/mdb-ver.1
@comment man/mant/ @comment man/mant/
share/applications/
share/omf/
share/omf/mdbtools/
share/omf/mdbtools/gmdb-C.omf