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

Unbreak build of dependent ports by moving includes from -ldap to -main.

Browse Source 
breakage reported by Nigel Taylor.
This commit is contained in:
ajacoutot 2011-06-02 15:54:10 +00:00
parent 297ddb4ef7
commit f5b39def0f
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/libgda/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2011/06/02 07:16:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2011/06/02 15:54:10 ajacoutot Exp $
SHARED_ONLY= Yes
@ -23,6 +23,9 @@ PKGNAME-mysql= libgda-mysql-${GNOME_VERSION}
PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION}
PKGNAME-ui= libgda-ui-${GNOME_VERSION}
REVISION-main= 0
REVISION-ldap= 0
EPOCH-main= 2
EPOCH-mdb= 0
EPOCH-mysql= 0

5
x11/gnome/libgda/pkg/PLIST-ldap
View File

@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST-ldap,v 1.5 2011/06/02 07:16:33 ajacoutot Exp $
include/libgda-${GDA_MAJOR}/libgda/gda-data-model-ldap.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-ldap.h
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-ldap-connection.h
@comment $OpenBSD: PLIST-ldap,v 1.6 2011/06/02 15:54:10 ajacoutot Exp $
@comment lib/libgda-${GDA_MAJOR}/providers/libgda-ldap.la
lib/libgda-${GDA_MAJOR}/providers/libgda-ldap.so
lib/pkgconfig/libgda-ldap-${GDA_MAJOR}.pc

6
x11/gnome/libgda/pkg/PLIST-main
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.17 2011/06/02 07:16:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.18 2011/06/02 15:54:10 ajacoutot Exp $
@conflict libgda-db4-*
@conflict libgda-ldap-<4.2.8p0
@pkgpath x11/gnome/libgda,-odbc
bin/gda-list-config
@bin bin/gda-list-config-${GDA_MAJOR}
@ -46,6 +47,7 @@ include/libgda-${GDA_MAJOR}/libgda/gda-data-model-extra.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-model-import.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-model-iter-extra.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-model-iter.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-model-ldap.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-model-private.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-model.h
include/libgda-${GDA_MAJOR}/libgda/gda-data-proxy.h
@ -78,6 +80,7 @@ include/libgda-${GDA_MAJOR}/libgda/gda-transaction-status.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-manager.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-columns.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-label.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-ldap.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-schemas.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-select.h
include/libgda-${GDA_MAJOR}/libgda/gda-tree-mgr-tables.h
@ -120,6 +123,7 @@ include/libgda-${GDA_MAJOR}/libgda/sqlite/gda-sqlite-provider.h
include/libgda-${GDA_MAJOR}/libgda/thread-wrapper/
include/libgda-${GDA_MAJOR}/libgda/thread-wrapper/gda-thread-wrapper.h
include/libgda-${GDA_MAJOR}/libgda/virtual/
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-ldap-connection.h
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-vconnection-data-model.h
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-vconnection-hub.h
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-virtual-connection.h