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

Rework this port so that -gtk and -gtk3 does not need to depend on the

Browse Source 
entire universe (yes gtk3 support has been added).
There are dragons in this port, I'm that close to remove the shit from
the tree...
This commit is contained in:
ajacoutot 2011-07-14 18:48:15 +00:00
parent 6a6ce53a5b
commit 4d682eb71c
13 changed files with 133 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
net/avahi/Makefile
View File

@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.64 2011/06/22 15:27:55 shadchin Exp $
# $OpenBSD: Makefile,v 1.65 2011/07/14 18:48:15 ajacoutot Exp $
COMMENT-main= framework for Multicast DNS Service Discovery
COMMENT-gtk= GUI client utilities for avahi
COMMENT-gtk= gtk+2 avahi-ui libraries
COMMENT-gtk3= gtk+3 avahi-ui libraries
COMMENT-gui= GUI client utilities for avahi
COMMENT-mono= mono (.NET) bindings for avahi
COMMENT-qt3= qt3 bindings for avahi
COMMENT-qt4= qt4 bindings for avahi
COMMENT-ui= common avahi-ui header for gtk+2 and gtk+3
V= 0.6.30
DISTNAME= avahi-${V}
@ -12,15 +15,18 @@ CATEGORIES= net devel
PKGNAME-main= avahi-${V}
PKGNAME-gtk= avahi-gtk-${V}
PKGNAME-gtk3= avahi-gtk3-${V}
PKGNAME-gui= avahi-gui-${V}
PKGNAME-mono= mono-avahi-${V}
PKGNAME-qt3= avahi-qt3-${V}
PKGNAME-qt4= avahi-qt4-${V}
PKGNAME-ui= avahi-ui-${V}
REVISION-main= 1
REVISION-gtk= 1
REVISION-mono= 0
REVISION-qt3= 0
REVISION-qt4= 0
REVISION-main= 2
REVISION-gtk= 2
REVISION-mono= 1
REVISION-qt3= 1
REVISION-qt4= 1
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
@ -42,16 +48,14 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/download/
PSEUDO_FLAVORS= no_gtk no_mono no_qt3 no_qt4
FLAVOR?= no_gtk no_mono no_qt3 no_qt4
PSEUDO_FLAVORS= no_gui no_mono no_qt3 no_qt4
FLAVOR?= no_gui no_mono no_qt3 no_qt4
MULTI_PACKAGES= -main
MODULES= devel/gettext \
textproc/intltool
USE_GROFF = Yes
BUILD_DEPENDS= converters/xmltoman \
devel/gobject-introspection
@ -91,31 +95,76 @@ CONFIGURE_ARGS+= --disable-mono \
--disable-monodoc
.endif
.if !${FLAVOR:L:Mno_gtk} || ${BUILD_MONO:L} == "yes"
SHARED_LIBS += avahi-ui 0.0 # .1.0
MULTI_PACKAGES+= -gtk
.if !${FLAVOR:L:Mno_gui} || ${BUILD_MONO:L} == "yes"
### common
MODULES+= lang/python
BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
x11/py-gtk2 \
x11/dbus-python
### -gtk
SHARED_LIBS += avahi-ui 0.0 # .1.0
MULTI_PACKAGES+= -gtk
LIB_DEPENDS-gtk= ${MODGETTEXT_LIB_DEPENDS} \
x11/gtk+2 \
net/avahi
RUN_DEPENDS-gtk= ${MODPY_RUN_DEPENDS} \
lang/python/${MODPY_VERSION},-gdbm \
x11/py-gtk2 \
x11/dbus-python \
devel/py-twisted/web \
devel/desktop-file-utils
RUN_DEPENDS-gtk= ${MODGETTEXT_RUN_DEPENDS} \
net/avahi,-ui,no_mono,no_qt3,no_qt4
WANTLIB-gtk= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \
Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
expat fontconfig freetype gdbm gdk-x11-2.0 gthread-2.0 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 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 pthread-stubs xcb z \
xcb-render avahi-client avahi-common GL Xxf86vm drm xcb-shm \
avahi-core avahi-glib ${MODGETTEXT_WANTLIB}
avahi-glib ${MODGETTEXT_WANTLIB}
### -gtk3
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
MULTI_PACKAGES+= -gtk3
LIB_DEPENDS-gtk3= ${MODGETTEXT_LIB_DEPENDS} \
x11/gtk+3 \
net/avahi
RUN_DEPENDS-gtk3= ${MODGETTEXT_RUN_DEPENDS} \
net/avahi,-ui,no_mono,no_qt3,no_qt4
WANTLIB-gtk3 += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gtk3 += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 avahi-client
WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
WANTLIB-gtk3 += dbus-1 drm expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB-gtk3 += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
WANTLIB-gtk3 += xcb-shm z ${MODGETTEXT_WANTLIB}
### -gui
MULTI_PACKAGES+= -gui
LIB_DEPENDS-gui= ${MODGETTEXT_LIB_DEPENDS} \
net/avahi,-gtk3,no_mono,no_qt3,no_qt4
RUN_DEPENDS-gui= ${MODGETTEXT_RUN_DEPENDS} \
${MODPY_RUN_DEPENDS} \
lang/python/${MODPY_VERSION},-gdbm \
x11/py-gtk2 \
x11/dbus-python \
devel/py-twisted/web \
devel/desktop-file-utils
WANTLIB-gui += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-gui += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 avahi-client
WANTLIB-gui += avahi-common avahi-core avahi-glib avahi-ui-gtk3 c
WANTLIB-gui += cairo cairo-gobject dbus-1 drm expat fontconfig freetype
WANTLIB-gui += gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB-gui += gobject-2.0 gthread-2.0 gtk-3 m pango-1.0
WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB-gui += pthread-stubs xcb xcb-render xcb-shm z
WANTLIB-gui += ${MODGETTEXT_WANTLIB}
### -ui
MULTI_PACKAGES+= -ui
LIB_DEPENDS-ui= # empty
RUN_DEPENDS-ui= net/avahi
WANTLIB-ui= # empty
.else
CONFIGURE_ARGS+= -disable-gtk \
CONFIGURE_ARGS+= --disable-gtk \
--disable-gtk3 \
--disable-python \
--disable-pygtk \
--disable-python-dbus
@ -181,8 +230,7 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--disable-doxygen-doc \
--disable-doxygen-dot \
--disable-doxygen-xml \
--disable-doxygen-html \
--disable-gtk3
--disable-doxygen-html
# don't link with libssp from the gcc4 port
# __guard and __stack_smash_handler are part of libc

3
net/avahi/pkg/DESCR-gtk
View File

@ -1,3 +1,4 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the GUI client utilities for avahi.
This package provides the gtk+2 avahi-ui libraries.

4
net/avahi/pkg/DESCR-gtk3 Normal file
View File

@ -0,0 +1,4 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the gtk+3 avahi-ui libraries.

5
net/avahi/pkg/DESCR-gui Normal file
View File

@ -0,0 +1,5 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the gtk+2, gtk+3 and python client utilities for
avahi.

1
net/avahi/pkg/DESCR-main
View File

@ -1,5 +1,6 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
It is a system which facilitates service discovery on a local network.
This means that you can plug your laptop or computer into a network and
instantly be able to view other people who you can chat with, find

1
net/avahi/pkg/DESCR-mono
View File

@ -1,3 +1,4 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the mono (.NET) bindings for avahi.

1
net/avahi/pkg/DESCR-qt3
View File

@ -1,3 +1,4 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the qt3 bindings for avahi.

1
net/avahi/pkg/DESCR-qt4
View File

@ -1,3 +1,4 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the qt4 bindings for avahi.

5
net/avahi/pkg/DESCR-ui Normal file
View File

@ -0,0 +1,5 @@
Avahi is a free, standards-compliant implementation of the Zeroconf
protocols Multicast DNS and DNS-SD.
This package provides the common avahi-ui.h header file for avahi-gtk
and avahi-gtk3.

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

@ -1,35 +1,5 @@
@comment $OpenBSD: PLIST-gtk,v 1.5 2011/06/13 07:11:30 ajacoutot Exp $
bin/avahi-bookmarks
bin/avahi-discover
@bin bin/avahi-discover-standalone
bin/bshell
@bin bin/bssh
bin/bvnc
include/avahi-ui/
include/avahi-ui/avahi-ui.h
lib/avahi/
lib/avahi/service-types.db
@comment $OpenBSD: PLIST-gtk,v 1.6 2011/07/14 18:48:15 ajacoutot Exp $
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
lib/python${MODPY_VERSION}/site-packages/avahi_discover/
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.ui
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

5
net/avahi/pkg/PLIST-gtk3 Normal file
View File

@ -0,0 +1,5 @@
@comment $OpenBSD: PLIST-gtk3,v 1.1 2011/07/14 18:48:15 ajacoutot Exp $
lib/libavahi-ui-gtk3.a
lib/libavahi-ui-gtk3.la
@lib lib/libavahi-ui-gtk3.so.${LIBavahi-ui-gtk3_VERSION}
lib/pkgconfig/avahi-ui-gtk3.pc

30
net/avahi/pkg/PLIST-gui Normal file
View File

@ -0,0 +1,30 @@
@comment $OpenBSD: PLIST-gui,v 1.1 2011/07/14 18:48:15 ajacoutot Exp $
@conflict avahi-gtk-<0.6.30p2
bin/avahi-bookmarks
bin/avahi-discover
@bin bin/avahi-discover-standalone
bin/bshell
@bin bin/bssh
bin/bvnc
lib/avahi/
lib/avahi/service-types.db
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
lib/python${MODPY_VERSION}/site-packages/avahi_discover/
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.ui
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

4
net/avahi/pkg/PLIST-ui Normal file
View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PLIST-ui,v 1.1 2011/07/14 18:48:15 ajacoutot Exp $
@conflict avahi-gtk-<0.6.30p2
include/avahi-ui/
include/avahi-ui/avahi-ui.h