[Midnightbsd-cvs] mports [18689] trunk/net: fix plist for avahi ports
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Apr 16 08:58:27 EDT 2015
Revision: 18689
http://svnweb.midnightbsd.org/mports/?rev=18689
Author: laffer1
Date: 2015-04-16 08:58:26 -0400 (Thu, 16 Apr 2015)
Log Message:
-----------
fix plist for avahi ports
Modified Paths:
--------------
trunk/net/Makefile
trunk/net/avahi-app/Makefile
trunk/net/avahi-app/pkg-plist
trunk/net/avahi-autoipd/Makefile
trunk/net/avahi-autoipd/pkg-plist
trunk/net/avahi-gtk/Makefile
trunk/net/avahi-gtk/pkg-plist
trunk/net/avahi-libdns/Makefile
trunk/net/avahi-libdns/pkg-plist
trunk/net/avahi-qt4/Makefile
trunk/net/avahi-qt4/pkg-plist
Added Paths:
-----------
trunk/net/avahi-header/
trunk/net/avahi-header/Makefile
trunk/net/avahi-header/pkg-descr
trunk/net/avahi-header/pkg-plist
Modified: trunk/net/Makefile
===================================================================
--- trunk/net/Makefile 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -9,6 +9,7 @@
SUBDIR += avahi-app
SUBDIR += avahi-autoipd
SUBDIR += avahi-gtk
+SUBDIR += avahi-header
SUBDIR += avahi-libdns
SUBDIR += avahi-qt4
SUBDIR += boinc-client
Modified: trunk/net/avahi-app/Makefile
===================================================================
--- trunk/net/avahi-app/Makefile 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-app/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -2,6 +2,7 @@
PORTNAME= avahi
PORTVERSION= 0.6.31
+PORTREVISION?= 1
CATEGORIES?= net dns
MASTER_SITES= http://www.avahi.org/download/
PKGNAMESUFFIX?= -app
Modified: trunk/net/avahi-app/pkg-plist
===================================================================
--- trunk/net/avahi-app/pkg-plist 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-app/pkg-plist 2015-04-16 12:58:26 UTC (rev 18689)
@@ -76,26 +76,33 @@
lib/libavahi-client.a
lib/libavahi-client.la
lib/libavahi-client.so
-lib/libavahi-client.so.5
+lib/libavahi-client.so.3
+lib/libavahi-client.so.3.2.9
lib/libavahi-common.a
lib/libavahi-common.la
lib/libavahi-common.so
+lib/libavahi-common.so.3
+lib/libavahi-common.so.3.5.3
lib/libavahi-core.a
lib/libavahi-core.la
lib/libavahi-core.so
lib/libavahi-core.so.7
+lib/libavahi-core.so.7.0.2
lib/libavahi-glib.a
lib/libavahi-glib.la
lib/libavahi-glib.so
lib/libavahi-glib.so.1
+lib/libavahi-glib.so.1.0.2
lib/libavahi-gobject.a
lib/libavahi-gobject.la
lib/libavahi-gobject.so
lib/libavahi-gobject.so.0
+lib/libavahi-gobject.so.0.0.4
lib/libhowl.a
lib/libhowl.la
lib/libhowl.so
lib/libhowl.so.0
+lib/libhowl.so.0.0.0
libdata/pkgconfig/avahi-client.pc
libdata/pkgconfig/avahi-compat-howl.pc
libdata/pkgconfig/avahi-core.pc
@@ -129,7 +136,7 @@
share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
- at comment share/dbus-1/system-services/org.freedesktop.Avahi.service
+share/dbus-1/system-services/org.freedesktop.Avahi.service
share/gir-1.0/Avahi-0.6.gir
share/gir-1.0/AvahiCore-0.6.gir
share/locale/bg/LC_MESSAGES/avahi.mo
@@ -165,23 +172,3 @@
share/locale/uk/LC_MESSAGES/avahi.mo
share/locale/zh_CN/LC_MESSAGES/avahi.mo
share/locale/zh_TW/LC_MESSAGES/avahi.mo
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/fo/LC_MESSAGES
- at dirrmtry share/locale/fo
- at dirrmtry share/locale/en_NZ/LC_MESSAGES
- at dirrmtry share/locale/en_NZ
- at dirrm %%DATADIR%%
- at dirrm lib/avahi
- at dirrm include/avahi-gobject
- at dirrm include/avahi-glib
- at dirrm include/avahi-core
- at dirrm include/avahi-compat-howl/salt
- at dirrm include/avahi-compat-howl/rendezvous
- at dirrm include/avahi-compat-howl/discovery
- at dirrm include/avahi-compat-howl/corby
- at dirrm include/avahi-compat-howl
- at dirrm include/avahi-common
- at dirrm include/avahi-client
- at dirrm etc/avahi/services
- at dirrm etc/avahi
Modified: trunk/net/avahi-autoipd/Makefile
===================================================================
--- trunk/net/avahi-autoipd/Makefile 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-autoipd/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -1,6 +1,6 @@
# $MidnightBSD$
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
PKGNAMESUFFIX= -autoipd
@@ -11,7 +11,7 @@
USERS= avahi-autoipd
GROUPS= ${USERS}
-LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-autoipd
@@ -23,8 +23,7 @@
AVAHI_SLAVE= autoipd
-MAN8= avahi-autoipd.8
-USE_GNOME= gnomehack ltverhack intltool
PKGINSTALL= ${.CURDIR}/pkg-install
+MANPAGES= avahi-autoipd.8
.include "${MASTERDIR}/Makefile"
Modified: trunk/net/avahi-autoipd/pkg-plist
===================================================================
--- trunk/net/avahi-autoipd/pkg-plist 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-autoipd/pkg-plist 2015-04-16 12:58:26 UTC (rev 18689)
@@ -1,3 +1,3 @@
etc/avahi/avahi-autoipd.action
sbin/avahi-autoipd
- at dirrm etc/avahi
+man/man8/avahi-autoipd.8.gz
Modified: trunk/net/avahi-gtk/Makefile
===================================================================
--- trunk/net/avahi-gtk/Makefile 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-gtk/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -1,6 +1,6 @@
# $MidnightBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
PKGNAMESUFFIX= -gtk
@@ -8,7 +8,8 @@
COMMENT= Gtk+ tools and bindings to the Avahi mDNS system
LICENSE= lgpl
-LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app
+RUN_DEPENDS= avahi-header>=0.6:${PORTSDIR}/net/avahi-header
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-ui
@@ -19,11 +20,10 @@
AVAHI_SLAVE= gtk
AVAHI_PKGCONFIG=avahi-ui.pc
-MAN1+= bssh.1
-MLINKS+= bssh.1 bvnc.1 \
- bssh.1 bshell.1
-USE_GNOME= gnomehack ltverhack intltool libglade2
+MANPAGES= bssh.1
+USE_GNOME+= libglade2
+
post-build:
@(cd ${WRKSRC}/avahi-discover-standalone; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${ALL_TARGET})
@@ -31,5 +31,9 @@
post-install:
@(cd ${WRKSRC}/avahi-discover-standalone; \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
+ ${LN} -sf man/man1/bssh.1 ${PREFIX}/man/man1/bvnc.1
+ ${LN} -sf man/man1/bssh.1 ${PREFIX}/man/man1/bshell.1
+ @${STRIP_CMD} ${PREFIX}/lib/libavahi-ui.so.0
+
.include "${MASTERDIR}/Makefile"
Modified: trunk/net/avahi-gtk/pkg-plist
===================================================================
--- trunk/net/avahi-gtk/pkg-plist 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-gtk/pkg-plist 2015-04-16 12:58:26 UTC (rev 18689)
@@ -2,15 +2,15 @@
bin/bshell
bin/bssh
bin/bvnc
-include/avahi-ui/avahi-ui.h
lib/libavahi-ui.a
lib/libavahi-ui.la
lib/libavahi-ui.so
lib/libavahi-ui.so.0
+lib/libavahi-ui.so.0.1.4
libdata/pkgconfig/avahi-ui.pc
+man/man1/bshell.1.gz
+man/man1/bssh.1.gz
+man/man1/bvnc.1.gz
share/applications/bssh.desktop
share/applications/bvnc.desktop
%%DATADIR%%/interfaces/avahi-discover.ui
- at dirrm %%DATADIR%%/interfaces
- at dirrmtry share/applications
- at dirrm include/avahi-ui
Added: trunk/net/avahi-header/Makefile
===================================================================
--- trunk/net/avahi-header/Makefile (rev 0)
+++ trunk/net/avahi-header/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -0,0 +1,28 @@
+# $MidnightBSD$
+
+PORTREVISION= 0
+CATEGORIES= net
+PKGNAMESUFFIX= -header
+
+COMMENT= Install an avahi-gtk* header to avoid conflict
+
+LICENSE= lgpl
+
+CONFLICT= avahi-gtk-0.6.[0-2]*
+
+MASTERDIR= ${.CURDIR}/../avahi-app
+BUILD_WRKSRC= ${WRKSRC}/avahi-ui
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+AVAHI_SLAVE= header
+
+NO_BUILD= yes
+
+do-install:
+ ${MKDIR} ${STAGEDIR}/${PREFIX}/include/avahi-ui
+ ${INSTALL_DATA} ${BUILD_WRKSRC}/avahi-ui.h \
+ ${STAGEDIR}/${PREFIX}/include/avahi-ui/
+
+.include "${MASTERDIR}/Makefile"
Property changes on: trunk/net/avahi-header/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/avahi-header/pkg-descr
===================================================================
--- trunk/net/avahi-header/pkg-descr (rev 0)
+++ trunk/net/avahi-header/pkg-descr 2015-04-16 12:58:26 UTC (rev 18689)
@@ -0,0 +1,5 @@
+The net/avahi-gtk and net/avahi-gtk3 install same header, avahi-ui.h. To
+avoid both ports to get conflict with the each others. Avoid both ports
+to install avahi-ui.h then have both ports to depend on here.
+
+WWW: http://www.avahi.org/
Property changes on: trunk/net/avahi-header/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/avahi-header/pkg-plist
===================================================================
--- trunk/net/avahi-header/pkg-plist (rev 0)
+++ trunk/net/avahi-header/pkg-plist 2015-04-16 12:58:26 UTC (rev 18689)
@@ -0,0 +1 @@
+include/avahi-ui/avahi-ui.h
Property changes on: trunk/net/avahi-header/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net/avahi-libdns/Makefile
===================================================================
--- trunk/net/avahi-libdns/Makefile 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-libdns/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -6,9 +6,10 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= mDNSResponder compatibility from Avahi
+
LICENSE= lgpl
-LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-compat-libdns_sd
Modified: trunk/net/avahi-libdns/pkg-plist
===================================================================
--- trunk/net/avahi-libdns/pkg-plist 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-libdns/pkg-plist 2015-04-16 12:58:26 UTC (rev 18689)
@@ -3,5 +3,5 @@
lib/libdns_sd.la
lib/libdns_sd.so
lib/libdns_sd.so.1
+lib/libdns_sd.so.1.0.0
libdata/pkgconfig/avahi-compat-libdns_sd.pc
- at dirrm include/avahi-compat-libdns_sd
Modified: trunk/net/avahi-qt4/Makefile
===================================================================
--- trunk/net/avahi-qt4/Makefile 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-qt4/Makefile 2015-04-16 12:58:26 UTC (rev 18689)
@@ -6,7 +6,7 @@
# $FreeBSD: ports/net/avahi-qt4/Makefile,v 1.7 2008/07/03 21:53:55 mezz Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
PKGNAMESUFFIX= -qt4
@@ -14,7 +14,7 @@
COMMENT= Qt 4 bindings to the Avahi mDNS system
LICENSE= lgpl
-LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-qt
@@ -23,7 +23,6 @@
PLIST= ${.CURDIR}/pkg-plist
AVAHI_SLAVE= qt4
-USE_GNOME= gnomehack ltverhack intltool
USE_QT4= corelib moc_build
AVAHI_PKGCONFIG= avahi-qt4.pc
Modified: trunk/net/avahi-qt4/pkg-plist
===================================================================
--- trunk/net/avahi-qt4/pkg-plist 2015-04-15 13:09:50 UTC (rev 18688)
+++ trunk/net/avahi-qt4/pkg-plist 2015-04-16 12:58:26 UTC (rev 18689)
@@ -3,5 +3,5 @@
lib/libavahi-qt4.la
lib/libavahi-qt4.so
lib/libavahi-qt4.so.1
+lib/libavahi-qt4.so.1.0.2
libdata/pkgconfig/avahi-qt4.pc
- at dirrm include/avahi-qt4
More information about the Midnightbsd-cvs
mailing list