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

- make this package use PSEUDO_FLAVORS so that one does not need to

Browse Source 
build half of the ports tree just to build the main subpackage; this
change will also allow to fix the cyclic with gtk2-cups and qt-3+4
- move some files from -main to -gtk where they belong
- as a side note, only the -gtk subpackage is SHARED_ONLY now
This commit is contained in:
ajacoutot 2009-06-04 21:42:40 +00:00
parent 97406af4db
commit ae1d9346ce
8 changed files with 74 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
net/avahi/Makefile
View File

@ -1,7 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2009/06/03 19:42:55 ajacoutot Exp $
# python MODULE
SHARED_ONLY= Yes
# $OpenBSD: Makefile,v 1.3 2009/06/04 21:42:40 ajacoutot Exp $
COMMENT-main= framework for Multicast DNS Service Discovery
COMMENT-gtk= GUI client utilities for avahi
@ -12,10 +9,10 @@ V= 0.6.25
DISTNAME= avahi-${V}
CATEGORIES= net devel
PKGNAME-main= avahi-${V}p0
PKGNAME-gtk= avahi-gtk-${V}
PKGNAME-qt3= avahi-qt3-${V}
PKGNAME-qt4= avahi-qt4-${V}
PKGNAME-main= avahi-${V}p1
PKGNAME-gtk= avahi-gtk-${V}p0
PKGNAME-qt3= avahi-qt3-${V}p0
PKGNAME-qt4= avahi-qt4-${V}p0
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
@ -40,54 +37,73 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/download/
MULTI_PACKAGES= -main -gtk -qt3 -qt4
PSEUDO_FLAVORS= no_gtk no_qt3 no_qt4
FLAVOR?=
MULTI_PACKAGES= -main
MODULES= devel/gettext \
lang/python \
textproc/intltool \
x11/qt3 \
x11/qt4
textproc/intltool
WANTLIB= c expat glib-2.0 gobject-2.0 pcre pthread
BUILD_DEPENDS= ::converters/xmltoman
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
glib-2.0.>=1800,gobject-2.0::devel/glib2 \
gdbm::databases/gdbm \
daemon::devel/libdaemon \
dbus-1::x11/dbus
BUILD_DEPENDS= ::converters/xmltoman \
:python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \
.if !${FLAVOR:L:Mno_gtk}
MULTI_PACKAGES+= -gtk
MODULES+= lang/python
BUILD_DEPENDS+= :python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \
::x11/py-gtk2 \
::x11/dbus-python
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
avahi-client,avahi-common,avahi-core,avahi-glib::net/avahi \
glade-2.0.>=1::devel/libglade2
RUN_DEPENDS-gtk= ::devel/desktop-file-utils \
::devel/py-twisted/web \
::x11/py-gtk2 \
::x11/dbus-python
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
avahi-client,avahi-common,avahi-core,avahi-glib::net/avahi \
glade-2.0.>=1::devel/libglade2
WANTLIB-gtk= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
expat fontconfig freetype gdbm gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \
gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png pthread xml2 z
.else
CONFIGURE_ARGS+= -disable-gtk \
--disable-python \
--disable-pygtk \
--disable-python-dbus
.endif
.if !${FLAVOR:L:Mno_qt3}
MULTI_PACKAGES+= -qt3
MODULES+= x11/qt3
LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
${MODQT3_LIB_DEPENDS} \
avahi-common::net/avahi
WANTLIB-qt3= GL ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
freetype jpeg lcms m mng png z
.else
CONFIGURE_ARGS+= --disable-qt3
.endif
.if !${FLAVOR:L:Mno_qt4}
MULTI_PACKAGES+= -qt4
MODULES+= x11/qt4
LIB_DEPENDS-qt4= ${MODGETTEXT_LIB_DEPENDS} \
QtCore.>=7::x11/qt4 \
avahi-common::net/avahi
WANTLIB-qt4=
.else
CONFIGURE_ARGS+= --disable-qt4
.endif
USE_GMAKE= Yes
USE_X11= Yes
@ -101,7 +117,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
PTHREAD_CFLAGS="-pthread" \
PTHREAD_LIBS="-pthread" \
PYTHON="${MODPY_BIN}"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--localstatedir="/var" \
--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \
--with-avahi-user=_avahi \
@ -115,8 +131,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-compat-libdns_sd \
--enable-core-docs \
--enable-tests \
--enable-qt3 \
--enable-qt4 \
--disable-mono \
--disable-monodoc \
--disable-doxygen-doc \

15
net/avahi/pkg/PFRAG.shared-main Normal file
View File

@ -0,0 +1,15 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2009/06/04 21:42:40 ajacoutot Exp $
lib/libavahi-client.la
@lib lib/libavahi-client.so.${LIBavahi-client_VERSION}
lib/libavahi-common.la
@lib lib/libavahi-common.so.${LIBavahi-common_VERSION}
lib/libavahi-core.la
@lib lib/libavahi-core.so.${LIBavahi-core_VERSION}
lib/libavahi-glib.la
@lib lib/libavahi-glib.so.${LIBavahi-glib_VERSION}
lib/libavahi-gobject.la
@lib lib/libavahi-gobject.so.${LIBavahi-gobject_VERSION}
lib/libdns_sd.la
@lib lib/libdns_sd.so.${LIBdns_sd_VERSION}
lib/libhowl.la
@lib lib/libhowl.so.${LIBhowl_VERSION}

3
net/avahi/pkg/PFRAG.shared-qt3 Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared-qt3,v 1.1 2009/06/04 21:42:40 ajacoutot Exp $
lib/libavahi-qt3.la
@lib lib/libavahi-qt3.so.${LIBavahi-qt3_VERSION}

3
net/avahi/pkg/PFRAG.shared-qt4 Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.shared-qt4,v 1.1 2009/06/04 21:42:40 ajacoutot Exp $
lib/libavahi-qt4.la
@lib lib/libavahi-qt4.so.${LIBavahi-qt4_VERSION}

10
net/avahi/pkg/PLIST-gtk
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gtk,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
@comment $OpenBSD: PLIST-gtk,v 1.2 2009/06/04 21:42:40 ajacoutot Exp $
bin/avahi-bookmarks
bin/avahi-discover
@bin bin/avahi-discover-standalone
@ -7,10 +7,14 @@ bin/bshell
bin/bvnc
include/avahi-ui/
include/avahi-ui/avahi-ui.h
lib/avahi/
lib/avahi/service-types.db
lib/libavahi-ui.a
lib/libavahi-ui.la
@lib lib/libavahi-ui.so.${LIBavahi-ui_VERSION}
lib/pkgconfig/avahi-ui.pc
lib/python${MODPY_VERSION}/site-packages/avahi/
lib/python${MODPY_VERSION}/site-packages/avahi/ServiceTypeDatabase.py
lib/python${MODPY_VERSION}/site-packages/avahi/__init__.py
lib/python${MODPY_VERSION}/site-packages/avahi/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/avahi/__init__.pyo
@ -21,10 +25,14 @@ lib/python${MODPY_VERSION}/site-packages/avahi_discover/SimpleGladeApp.pyo
lib/python${MODPY_VERSION}/site-packages/avahi_discover/__init__.py
lib/python${MODPY_VERSION}/site-packages/avahi_discover/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/avahi_discover/__init__.pyo
@man man/man1/avahi-bookmarks.1
@man man/man1/avahi-discover.1
@man man/man1/bssh.1
@man man/man1/bvnc.1
share/applications/avahi-discover.desktop
share/applications/bssh.desktop
share/applications/bvnc.desktop
share/avahi/interfaces/
share/avahi/interfaces/avahi-discover.glade
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database

25
net/avahi/pkg/PLIST-main
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2009/06/04 21:42:40 ajacoutot Exp $
@conflict howl-*
@newgroup _avahi:629
@newgroup _avahi-autoipd:630
@newuser _avahi:629:629:daemon:Avahi User:/var/empty:/sbin/nologin
@newuser _avahi-autoipd:630:630:daemon:Avahi Autoipd User:/var/empty:/sbin/nologin
%%SHARED%%
@bin bin/avahi-browse
bin/avahi-browse-domains
@bin bin/avahi-publish
@ -76,41 +77,21 @@ include/avahi-gobject/ga-error.h
include/avahi-gobject/ga-record-browser.h
include/avahi-gobject/ga-service-browser.h
include/avahi-gobject/ga-service-resolver.h
lib/avahi/
lib/avahi/service-types.db
lib/libavahi-client.a
lib/libavahi-client.la
@lib lib/libavahi-client.so.${LIBavahi-client_VERSION}
lib/libavahi-common.a
lib/libavahi-common.la
@lib lib/libavahi-common.so.${LIBavahi-common_VERSION}
lib/libavahi-core.a
lib/libavahi-core.la
@lib lib/libavahi-core.so.${LIBavahi-core_VERSION}
lib/libavahi-glib.a
lib/libavahi-glib.la
@lib lib/libavahi-glib.so.${LIBavahi-glib_VERSION}
lib/libavahi-gobject.a
lib/libavahi-gobject.la
@lib lib/libavahi-gobject.so.${LIBavahi-gobject_VERSION}
lib/libdns_sd.a
lib/libdns_sd.la
@lib lib/libdns_sd.so.${LIBdns_sd_VERSION}
lib/libhowl.a
lib/libhowl.la
@lib lib/libhowl.so.${LIBhowl_VERSION}
lib/pkgconfig/avahi-client.pc
lib/pkgconfig/avahi-compat-howl.pc
lib/pkgconfig/avahi-compat-libdns_sd.pc
lib/pkgconfig/avahi-core.pc
lib/pkgconfig/avahi-glib.pc
lib/pkgconfig/avahi-gobject.pc
lib/python${MODPY_VERSION}/site-packages/avahi/
lib/python${MODPY_VERSION}/site-packages/avahi/ServiceTypeDatabase.py
@man man/man1/avahi-bookmarks.1
@man man/man1/avahi-browse-domains.1
@man man/man1/avahi-browse.1
@man man/man1/avahi-discover.1
@man man/man1/avahi-publish-address.1
@man man/man1/avahi-publish-service.1
@man man/man1/avahi-publish.1
@ -128,8 +109,6 @@ lib/python${MODPY_VERSION}/site-packages/avahi/ServiceTypeDatabase.py
@bin sbin/avahi-dnsconfd
share/avahi/
share/avahi/avahi-service.dtd
share/avahi/interfaces/
share/avahi/interfaces/avahi-discover.glade
share/avahi/introspection/
share/avahi/introspection/AddressResolver.introspect
share/avahi/introspection/DomainBrowser.introspect

5
net/avahi/pkg/PLIST-qt3
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST-qt3,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
@comment $OpenBSD: PLIST-qt3,v 1.2 2009/06/04 21:42:40 ajacoutot Exp $
%%SHARED%%
include/avahi-qt3/
include/avahi-qt3/qt-watch.h
lib/libavahi-qt3.a
lib/libavahi-qt3.la
@lib lib/libavahi-qt3.so.${LIBavahi-qt3_VERSION}
lib/pkgconfig/avahi-qt3.pc

5
net/avahi/pkg/PLIST-qt4
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST-qt4,v 1.1.1.1 2009/06/03 16:27:12 ajacoutot Exp $
@comment $OpenBSD: PLIST-qt4,v 1.2 2009/06/04 21:42:40 ajacoutot Exp $
%%SHARED%%
include/avahi-qt4/
include/avahi-qt4/qt-watch.h
lib/libavahi-qt4.a
lib/libavahi-qt4.la
@lib lib/libavahi-qt4.so.${LIBavahi-qt4_VERSION}
lib/pkgconfig/avahi-qt4.pc