4 files changed, 32 insertions, 34 deletions

diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 80ba07431552..0013204ad972 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xlog
-PORTVERSION=	1.3.1
+PORTVERSION=	1.5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 		http://www.qsl.net/pg4i/download/
@@ -13,21 +13,23 @@ MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio logging application
 
-USE_GNOME=	libgnomeprint gtk20
+USE_GETTEXT=	yes
+USE_GNOME=	libgnomeprint gnomelibs gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mime-update \
 		--mandir=${PREFIX}/man
 
-.if defined(WITH_HAMLIB)
 LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
-CONFIGURE_ARGS+=	--enable-hamlib
-.endif
 
 MAN1=		xlog.1
 
-pre-extract:
-.if !defined(WITH_HAMLIB)
-	@${ECHO_MSG} "You can enable hamlib support for Xlog by defining WITH_HAMLIB"
+.if defined (WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+WITHNLS=	"@comment "
+.else
+WITHNLS=	""
 .endif
 
+PLIST_SUB+=	WITHNLS=${WITHNLS}
+
 .include <bsd.port.mk>
diff --git a/comms/xlog/distinfo b/comms/xlog/distinfo
index d175d4bae9e4..6e27eb881f5e 100644
--- a/comms/xlog/distinfo
+++ b/comms/xlog/distinfo
@@ -1,3 +1,3 @@
-MD5 (xlog-1.3.1.tar.gz) = a8296c5cb270a5ab9d386652c27262f8
-SHA256 (xlog-1.3.1.tar.gz) = ea268b324d8d83f0db55394e83b375b25f30d35db26acf48d808add8d9163a20
-SIZE (xlog-1.3.1.tar.gz) = 804675
+MD5 (xlog-1.5.tar.gz) = 0ffd571df3d704a0453c05a6a91ddb10
+SHA256 (xlog-1.5.tar.gz) = 10da8f306ee50cca0c942e0c6cb7066cd1a485b150aa049ab3010abfb7673279
+SIZE (xlog-1.5.tar.gz) = 866421
diff --git a/comms/xlog/pkg-descr b/comms/xlog/pkg-descr
index 57ba7772677b..a7b007a36cbf 100644
--- a/comms/xlog/pkg-descr
+++ b/comms/xlog/pkg-descr
@@ -7,7 +7,7 @@ and heading calculation for VHF logging is also supported.
 Xlog supports cabrillo and ADIF and can import twlog and editest files.
 It also has the ability to customise log fields which makes it ideal for
 use in those countries that have odd logging rules such as the U.K. Also
-included is the ability to log using the FCC emmissions codes.
+included is the ability to log using the FCC emissions codes.
 
 There is a new format for exporting the log called 'labels'. This will
 save some fields of the log in a TAB separated file. This file can be
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index 59627eea977b..a9bba05105c9 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -1,12 +1,8 @@
 bin/xlog
-share/application-registry/xlog.applications
 share/applications/xlog.desktop
-share/applnk/Applications/xlog.desktop
-share/mime-info/xlog.keys
-share/mime-info/xlog.mime
 share/mime/packages/xlog.xml
-share/mimelnk/text/x-xlog.desktop
 share/pixmaps/gnome-mime-text-x-xlog.png
+share/pixmaps/xlog-icon.png
 share/pixmaps/xlog/cwdaemon.png
 share/pixmaps/xlog/gnome-mime-text-x-xlog.png
 share/pixmaps/xlog/jigsaw.png
@@ -28,40 +24,44 @@ share/pixmaps/xlog/s9.xpm
 share/pixmaps/xlog/xlog-b4.png
 share/pixmaps/xlog/xlog-icon.png
 share/pixmaps/xlog/xlog-keyer.png
+share/pixmaps/xlog/xlog-scoring.png
 share/pixmaps/xlog/xlog.png
 share/pixmaps/xlog/xlog.xpm
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/BUGS
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/FAQ
-%%DATADIR%%/FAQ.fr
-%%DATADIR%%/FAQ.pl
+%%DATADIR%%/KEYS
 %%DATADIR%%/MANUAL
-%%DATADIR%%/MANUAL.fr
-%%DATADIR%%/MANUAL.pl
 %%DATADIR%%/THANKS
 %%DATADIR%%/TODO
 %%DATADIR%%/dxcc/cty.dat
 %%DATADIR%%/images/xlog-defaultsdialog.png
 %%DATADIR%%/images/xlog-dupecheckdialog.png
+%%DATADIR%%/images/xlog-exportdialog.png
+%%DATADIR%%/images/xlog-importdialog.png
 %%DATADIR%%/images/xlog-keyerwindow.png
 %%DATADIR%%/images/xlog-logeditor.png
 %%DATADIR%%/images/xlog-mainwindow.png
 %%DATADIR%%/images/xlog-mergelogdialog.png
 %%DATADIR%%/images/xlog-newlogdialog.png
 %%DATADIR%%/images/xlog-openlogdialog.png
+%%DATADIR%%/images/xlog-preferencesdialog-general.png
 %%DATADIR%%/images/xlog-preferencesdialog-hamlib.png
 %%DATADIR%%/images/xlog-preferencesdialog-info.png
+%%DATADIR%%/images/xlog-preferencesdialog-logs.png
 %%DATADIR%%/images/xlog-printdialog.png
+%%DATADIR%%/images/xlog-scorewindow.png
 %%DATADIR%%/images/xlog-workedwindow.png
 %%DATADIR%%/qsllabels.glabels
-share/locale/da/LC_MESSAGES/xlog.mo
-share/locale/es/LC_MESSAGES/xlog.mo
-share/locale/fr/LC_MESSAGES/xlog.mo
-share/locale/nl/LC_MESSAGES/xlog.mo
-share/locale/cs/LC_MESSAGES/xlog.mo
-share/locale/pl/LC_MESSAGES/xlog.mo
-share/locale/sk/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/da/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/es/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/fr/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/nl/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/cs/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/pl/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/sk/LC_MESSAGES/xlog.mo
+%%WITHNLS%%share/locale/sv/LC_MESSAGES/xlog.mo
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/dxcc
 @dirrm %%DATADIR%%
@@ -69,10 +69,6 @@ share/locale/sk/LC_MESSAGES/xlog.mo
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @dirrmtry share/applications
-@dirrmtry share/applnk/Applications
-@dirrmtry share/applnk
-@dirrmtry share/application-registry
-@dirrmtry share/mimelnk/text
-@dirrmtry share/mimelnk
-@dirrmtry share/mime-info
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
 @dirrmtry share/pixmaps