pkg/42171: net/avahi wrong PLIST with +python -gdbm

[corecode%fs.ei.tum.de@localhost]

>Number:         42171
>Category:       pkg
>Synopsis:       net/avahi wrong PLIST with +python -gdbm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 10 10:25:00 +0000 2009
>Originator:     Simon Schubert
>Release:        pkgsrc HEAD
>Organization:
DragonFly
>Environment:
PKG_OPTIONS.avahi= python -gdbm
>Description:
avahi does not build avahi-discover unless both python and gdbm are enabled.  
the PLIST for +python however contains avahi-discover.  It should be in pygdbm.
>How-To-Repeat:
cd net/avahi; bmake "PKG_OPTIONS.avahi= python -gdbm" install
>Fix:
diff --git a/net/avahi/PLIST.pygdbm b/net/avahi/PLIST.pygdbm
index 429c5d9..0fdae15 100644
--- a/net/avahi/PLIST.pygdbm
+++ b/net/avahi/PLIST.pygdbm
@@ -1,3 +1,13 @@
 @comment $NetBSD: PLIST.pygdbm,v 1.1.1.1 2008/12/20 17:36:14 wiz Exp $
-lib/avahi/service-types.db
 ${PYSITELIB}/avahi/ServiceTypeDatabase.py
+${PYSITELIB}/avahi_discover/SimpleGladeApp.py
+${PYSITELIB}/avahi_discover/SimpleGladeApp.pyc
+${PYSITELIB}/avahi_discover/SimpleGladeApp.pyo
+${PYSITELIB}/avahi_discover/__init__.py
+${PYSITELIB}/avahi_discover/__init__.pyc
+${PYSITELIB}/avahi_discover/__init__.pyo
+bin/avahi-discover
+lib/avahi/service-types.db
+man/man1/avahi-discover.1
+share/applications/avahi-discover.desktop
+share/avahi/interfaces/avahi-discover.glade
diff --git a/net/avahi/PLIST.python b/net/avahi/PLIST.python
index 81e122c..bf4f2f6 100644
--- a/net/avahi/PLIST.python
+++ b/net/avahi/PLIST.python
@@ -2,17 +2,7 @@
 ${PYSITELIB}/avahi/__init__.py
 ${PYSITELIB}/avahi/__init__.pyc
 ${PYSITELIB}/avahi/__init__.pyo
-${PYSITELIB}/avahi_discover/__init__.py
-${PYSITELIB}/avahi_discover/__init__.pyc
-${PYSITELIB}/avahi_discover/__init__.pyo
-${PYSITELIB}/avahi_discover/SimpleGladeApp.py
-${PYSITELIB}/avahi_discover/SimpleGladeApp.pyc
-${PYSITELIB}/avahi_discover/SimpleGladeApp.pyo
 bin/avahi-bookmarks
-bin/avahi-discover
 bin/avahi-set-host-name
 man/man1/avahi-bookmarks.1
-man/man1/avahi-discover.1
 man/man1/avahi-set-host-name.1
-share/applications/avahi-discover.desktop
-share/avahi/interfaces/avahi-discover.glade