- Update to 1.4.

4 files changed, 76 insertions, 92 deletions

diff --git a/x11-clocks/alarm-clock/Makefile b/x11-clocks/alarm-clock/Makefile
index cab3d36eb84..261d38cdcad 100644
--- a/x11-clocks/alarm-clock/Makefile
+++ b/x11-clocks/alarm-clock/Makefile
@@ -6,22 +6,29 @@
 #
 
 PORTNAME=	alarm-clock
-PORTVERSION=	0.9.11.2
-PORTREVISION=	4
+PORTVERSION=	1.4
 CATEGORIES=	x11-clocks deskutils
-MASTER_SITES=	http://dp0154.debowypark.waw.pl/ac/downloads/
+MASTER_SITES=	http://www.alarm-clock.pl/media/distfiles/
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Alarm Clock for the GNOME desktop
 
-LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
-		${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
+LIB_DEPENDS=	unique-1:${PORTSDIR}/x11-toolkits/unique \
+		notify.1:${PORTSDIR}/devel/libnotify
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_PYTHON=	yes
 USE_GETTEXT=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
+USE_GMAKE=	yes
+USE_GSTREAMER=	yes
+USE_GNOME=	gnomehack gtk20
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/alarm-clock/distinfo b/x11-clocks/alarm-clock/distinfo
index 2c84c92b24a..d204c835678 100644
--- a/x11-clocks/alarm-clock/distinfo
+++ b/x11-clocks/alarm-clock/distinfo
@@ -1,3 +1,3 @@
-MD5 (alarm-clock-0.9.11.2.tar.bz2) = 776634db255ba9982d08b4d3743e5a9a
-SHA256 (alarm-clock-0.9.11.2.tar.bz2) = 88fc4c2a61d658597d4624b24732db93521689fd0ab4be26cab1eb40e6925c43
-SIZE (alarm-clock-0.9.11.2.tar.bz2) = 521363
+MD5 (alarm-clock-1.4.tar.bz2) = 1cb6a6dda2cbc99f8be7f14228decec0
+SHA256 (alarm-clock-1.4.tar.bz2) = 397086b3150de8e1fd6b0ee9bbe27ba3bb4812f9a32c458514340e0a97640236
+SIZE (alarm-clock-1.4.tar.bz2) = 1044104
diff --git a/x11-clocks/alarm-clock/pkg-descr b/x11-clocks/alarm-clock/pkg-descr
index 5f9b7bc4ee7..de876d18ce5 100644
--- a/x11-clocks/alarm-clock/pkg-descr
+++ b/x11-clocks/alarm-clock/pkg-descr
@@ -3,4 +3,4 @@ supports sound fading, passive and normal dialogs, full screen dialogs,
 scheduling options command line running and few standard actions. It has an
 intuitive interface and it can be translated to any language.
 
-WWW:	http://alarm-clock.54.pl/
+WWW:	http://www.alarm-clock.pl/
diff --git a/x11-clocks/alarm-clock/pkg-plist b/x11-clocks/alarm-clock/pkg-plist
index 24aa554c32b..b0e31369435 100644
--- a/x11-clocks/alarm-clock/pkg-plist
+++ b/x11-clocks/alarm-clock/pkg-plist
@@ -1,83 +1,60 @@
 @comment $FreeBSD$
 bin/alarm-clock
-%%PYTHON_SITELIBDIR%%/alarmclock/CheckAlarmThread.py
-%%PYTHON_SITELIBDIR%%/alarmclock/CheckAlarmThread.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/CheckAlarmThread.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/CountThread.py
-%%PYTHON_SITELIBDIR%%/alarmclock/CountThread.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/CountThread.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/MainClass.py
-%%PYTHON_SITELIBDIR%%/alarmclock/MainClass.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/MainClass.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/OldDirCheck.py
-%%PYTHON_SITELIBDIR%%/alarmclock/OldDirCheck.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/OldDirCheck.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/Prefix.py
-%%PYTHON_SITELIBDIR%%/alarmclock/Prefix.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/Prefix.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/RepeatSoundThread.py
-%%PYTHON_SITELIBDIR%%/alarmclock/RepeatSoundThread.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/RepeatSoundThread.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/SnoozeThread.py
-%%PYTHON_SITELIBDIR%%/alarmclock/SnoozeThread.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/SnoozeThread.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/Version.py
-%%PYTHON_SITELIBDIR%%/alarmclock/Version.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/Version.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/VolumeFadeThread.py
-%%PYTHON_SITELIBDIR%%/alarmclock/VolumeFadeThread.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/VolumeFadeThread.pyo
-%%PYTHON_SITELIBDIR%%/alarmclock/__init__.py
-%%PYTHON_SITELIBDIR%%/alarmclock/__init__.pyc
-%%PYTHON_SITELIBDIR%%/alarmclock/__init__.pyo
-%%DATADIR%%/glade/main.glade
-%%DATADIR%%/scalable/alarm-caution.svg
-%%DATADIR%%/scalable/alarm-clock.svg
-%%DATADIR%%/sound/ring.wav
+%%DATADIR%%/alarm-clock.ui
+%%DATADIR%%/ring.wav
+%%DATADIR%%/alarm-caution.svg
+%%DATADIR%%/alarm-clock.svg
+%%NLS%%share/locale/mk/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/id/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/el/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/de/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/da/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/la/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/it/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/es/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/si/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/he/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/alarm-clock.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/alarm-clock.mo
 share/applications/alarm-clock.desktop
-share/locale/ar/LC_MESSAGES/alarm-clock.mo
-share/locale/ca/LC_MESSAGES/alarm-clock.mo
-share/locale/cs/LC_MESSAGES/alarm-clock.mo
-share/locale/da/LC_MESSAGES/alarm-clock.mo
-share/locale/de_DE/LC_MESSAGES/alarm-clock.mo
-share/locale/en_GB/LC_MESSAGES/alarm-clock.mo
-share/locale/es/LC_MESSAGES/alarm-clock.mo
-share/locale/el/LC_MESSAGES/alarm-clock.mo
-share/locale/fa/LC_MESSAGES/alarm-clock.mo
-share/locale/fr/LC_MESSAGES/alarm-clock.mo
-share/locale/he/LC_MESSAGES/alarm-clock.mo
-share/locale/hu/LC_MESSAGES/alarm-clock.mo
-share/locale/it/LC_MESSAGES/alarm-clock.mo
-share/locale/ja/LC_MESSAGES/alarm-clock.mo
-share/locale/ko/LC_MESSAGES/alarm-clock.mo
-share/locale/la/LC_MESSAGES/alarm-clock.mo
-share/locale/lv/LC_MESSAGES/alarm-clock.mo
-share/locale/nb/LC_MESSAGES/alarm-clock.mo
-share/locale/nds/LC_MESSAGES/alarm-clock.mo
-share/locale/nl/LC_MESSAGES/alarm-clock.mo
-share/locale/pl/LC_MESSAGES/alarm-clock.mo
-share/locale/pt/LC_MESSAGES/alarm-clock.mo
-share/locale/pt_BR/LC_MESSAGES/alarm-clock.mo
-share/locale/ro/LC_MESSAGES/alarm-clock.mo
-share/locale/ru/LC_MESSAGES/alarm-clock.mo
-share/locale/sr/LC_MESSAGES/alarm-clock.mo
-share/locale/sr@latin/LC_MESSAGES/alarm-clock.mo
-share/locale/sv/LC_MESSAGES/alarm-clock.mo
-share/locale/tr/LC_MESSAGES/alarm-clock.mo
-share/locale/zh_CN/LC_MESSAGES/alarm-clock.mo
-share/locale/zh_TW/LC_MESSAGES/alarm-clock.mo
-share/pixmaps/alarm-clock.svg
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/la/LC_MESSAGES
-@dirrmtry share/locale/la
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
+share/pixmaps/alarm-clock.png
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/INSTALL
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrmtry share/alarm-clock/sound
-@dirrmtry share/alarm-clock/scalable
-@dirrmtry share/alarm-clock/glade
-@dirrmtry share/alarm-clock
-@dirrmtry %%PYTHON_SITELIBDIR%%/alarmclock
+%%NLS%%@dirrmtry share/locale/la/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/la