Packaged DeforaOS Phone 0.4.1

Bugfix release for 0.4.0, notably for:
* issue with the "oss" plug-in
* less warnings when building with Gtk+ 3

DeforaOS Phone 0.4.0 did bring:
* support for Gtk+ 3 (except for the new "video" plug-in)
* new and updated plug-ins and tools
* additional features and interface updates
* as well as improved documentation (manual pages...)
* and additional improvements under the hood (portability, XDG compliance...)

Also drops the dependency on audio/pulseaudio.

4 files changed, 58 insertions, 38 deletions

diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile
index 56f1f4e6c1e..e963a770d21 100644
--- a/comms/deforaos-phone/Makefile
+++ b/comms/deforaos-phone/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2014/06/09 14:18:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2014/10/23 18:33:39 khorben Exp $
 #
 
-DISTNAME=	Phone-0.3.12
-PKGNAME=	deforaos-phone-0.3.12
-PKGREVISION=	9
+DISTNAME=	Phone-0.4.1
+PKGNAME=	deforaos-phone-0.4.1
 CATEGORIES=	comms net
-MASTER_SITES=	http://www.defora.org/os/download/download/4296/
+MASTER_SITES=	http://www.defora.org/os/download/download/4336/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -27,18 +26,21 @@ AUTO_MKDIRS=	yes
 
 .if ${PKGMANDIR} != "share/man"
 post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/gprs.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/gprs.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/phone.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/phone.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/phonectl.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/phonectl.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/man1/gprs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gprs.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/phone.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phone.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/phonectl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/phonectl.1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man
 .endif
 
-.include "options.mk"
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/sofia-sip/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/deforaos-locker/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/deforaos-phone/PLIST b/comms/deforaos-phone/PLIST
index a6be6e668d9..2ec5ea38d29 100644
--- a/comms/deforaos-phone/PLIST
+++ b/comms/deforaos-phone/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/15 12:56:27 khorben Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/23 18:33:39 khorben Exp $
+bin/gprs
 bin/phone
 bin/phonectl
 include/Desktop/Phone.h
@@ -23,47 +24,74 @@ lib/Phone/plugins/oss.so
 lib/Phone/plugins/panel.so
 lib/Phone/plugins/password.so
 lib/Phone/plugins/profiles.so
-lib/Phone/plugins/pulseaudio.so
 lib/Phone/plugins/smscrypt.so
 lib/Phone/plugins/systray.so
 lib/Phone/plugins/ussd.so
+man/html1/gprs.html
+man/html1/phone.html
+man/html1/phonectl.html
+man/man1/gprs.1
 man/man1/phone.1
 man/man1/phonectl.1
-share/applications/phone-contacts.desktop
-share/applications/phone-dialer.desktop
-share/applications/phone-log.desktop
-share/applications/phone-messages.desktop
-share/applications/phone-settings.desktop
-share/doc/html/Phone/phone.html
-share/doc/html/Phone/phonectl.html
-share/icons/hicolor/16x16/apps/phone-dialer.png
+share/applications/deforaos-phone-contacts.desktop
+share/applications/deforaos-phone-dialer.desktop
+share/applications/deforaos-phone-log.desktop
+share/applications/deforaos-phone-messages.desktop
+share/applications/deforaos-phone-settings.desktop
+share/applications/deforaos-phone-sofia.desktop
+share/doc/Phone/gprs.conf
+share/doc/Phone/phone.conf
+share/doc/Phone/pppd-chat_gprs
+share/doc/Phone/pppd-peers_gprs
+share/doc/Phone/pppd-peers_phone
 share/icons/hicolor/16x16/apps/phone-drafts.png
+share/icons/hicolor/16x16/apps/phone-gprs.png
 share/icons/hicolor/16x16/apps/phone-inbox.png
 share/icons/hicolor/16x16/apps/phone-n900.png
 share/icons/hicolor/16x16/apps/phone-openmoko.png
 share/icons/hicolor/16x16/apps/phone-roaming.png
 share/icons/hicolor/16x16/apps/phone-sent.png
-share/icons/hicolor/22x22/apps/phone-dialer.png
+share/icons/hicolor/22x22/apps/phone-gprs.png
 share/icons/hicolor/22x22/apps/phone-signal-00.png
 share/icons/hicolor/22x22/apps/phone-signal-100.png
 share/icons/hicolor/22x22/apps/phone-signal-25.png
 share/icons/hicolor/22x22/apps/phone-signal-50.png
 share/icons/hicolor/22x22/apps/phone-signal-75.png
-share/icons/hicolor/24x24/apps/phone-dialer.png
 share/icons/hicolor/24x24/apps/phone-drafts.png
+share/icons/hicolor/24x24/apps/phone-gprs.png
 share/icons/hicolor/24x24/apps/phone-inbox.png
 share/icons/hicolor/24x24/apps/phone-n900.png
 share/icons/hicolor/24x24/apps/phone-openmoko.png
 share/icons/hicolor/24x24/apps/phone-roaming.png
 share/icons/hicolor/24x24/apps/phone-sent.png
-share/icons/hicolor/32x32/apps/phone-dialer.png
+share/icons/hicolor/32x32/apps/phone-gprs.png
 share/icons/hicolor/32x32/apps/phone-n900.png
 share/icons/hicolor/32x32/apps/phone-openmoko.png
 share/icons/hicolor/32x32/apps/phone-roaming.png
-share/icons/hicolor/48x48/apps/phone-dialer.png
+share/icons/hicolor/48x48/apps/phone-gprs.png
 share/icons/hicolor/48x48/apps/phone-inbox.png
 share/icons/hicolor/48x48/apps/phone-n900.png
 share/icons/hicolor/48x48/apps/phone-openmoko.png
 share/icons/hicolor/48x48/apps/phone-roaming.png
 share/icons/hicolor/48x48/apps/phone-sent.png
 share/locale/fr/LC_MESSAGES/Phone.mo
+share/sounds/Phone/0.wav
+share/sounds/Phone/1.wav
+share/sounds/Phone/2.wav
+share/sounds/Phone/3.wav
+share/sounds/Phone/4.wav
+share/sounds/Phone/5.wav
+share/sounds/Phone/6.wav
+share/sounds/Phone/7.wav
+share/sounds/Phone/8.wav
+share/sounds/Phone/9.wav
+share/sounds/Phone/a.wav
+share/sounds/Phone/b.wav
+share/sounds/Phone/busy.wav
+share/sounds/Phone/c.wav
+share/sounds/Phone/d.wav
+share/sounds/Phone/hash.wav
+share/sounds/Phone/keytone.wav
+share/sounds/Phone/ringback.wav
+share/sounds/Phone/ringtone.wav
+share/sounds/Phone/star.wav
diff --git a/comms/deforaos-phone/distinfo b/comms/deforaos-phone/distinfo
index 7fc4a08c352..9cf6aa3fb81 100644
--- a/comms/deforaos-phone/distinfo
+++ b/comms/deforaos-phone/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/06/15 12:56:27 khorben Exp $
+$NetBSD: distinfo,v 1.3 2014/10/23 18:33:39 khorben Exp $
 
-SHA1 (Phone-0.3.12.tar.gz) = 479a64694d190c3b4ee96c74fd596e69d5ef72c4
-RMD160 (Phone-0.3.12.tar.gz) = cc93fd0dcf8d1ea406cb72a5eb66b4f017266b00
-Size (Phone-0.3.12.tar.gz) = 175768 bytes
+SHA1 (Phone-0.4.1.tar.gz) = c4a3c775b8e98ce5ed681c6c7dcb44b3a29b1e44
+RMD160 (Phone-0.4.1.tar.gz) = 83a1f164ed61fa6a134ee40b8cbd0409a6e0096a
+Size (Phone-0.4.1.tar.gz) = 313098 bytes
diff --git a/comms/deforaos-phone/options.mk b/comms/deforaos-phone/options.mk
deleted file mode 100644
index 234a24ca314..00000000000
--- a/comms/deforaos-phone/options.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2012/12/17 01:16:28 khorben Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.deforaos-phone
-PKG_SUPPORTED_OPTIONS=	embedded
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+=	CPPFLAGS=-DEMBEDDED
-.endif