- Update to 0.3.3

PR:		ports/102751
Submitted by:	Diane Bruce <db@db.net>
Approved by:	maintainer timeout (az, 1 month)

8 files changed, 220 insertions, 18 deletions

diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 05b8f2324ce5..5855602644b2 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	klog
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.3.3
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://download.berlios.de/klog/
+MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITE_SUBDIR=	klog
 
 MAINTAINER=	az@FreeBSD.org
 COMMENT=	ADIF compatible logging application
@@ -19,4 +19,8 @@ USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 
+post-install:
+	@${INSTALL_DATA}	${WRKSRC}/src/klog.desktop \
+		 ${PREFIX}/share/applnk/Applications/klog.desktop
+
 .include <bsd.port.mk>
diff --git a/comms/klog/distinfo b/comms/klog/distinfo
index d1f2db799035..bdb9d1e746f0 100644
--- a/comms/klog/distinfo
+++ b/comms/klog/distinfo
@@ -1,3 +1,3 @@
-MD5 (klog-0.3.2.tar.gz) = e6a7c5acca88942647565950ab704a33
-SHA256 (klog-0.3.2.tar.gz) = b385224aa96446859032d8e7bcc26290592da7540205f2920c3acad51086c3ba
-SIZE (klog-0.3.2.tar.gz) = 911797
+MD5 (klog-0.3.3.tar.gz) = c948bbe70c9d475f0299171f9175488a
+SHA256 (klog-0.3.3.tar.gz) = e23bf0dd37ac1b28a20a6e2ba5a61b089ca5c9736ca545d38e7b865cae8992bb
+SIZE (klog-0.3.3.tar.gz) = 635599
diff --git a/comms/klog/files/patch-Makefile.in b/comms/klog/files/patch-Makefile.in
index 2ef61ce7d206..1000bc667a05 100644
--- a/comms/klog/files/patch-Makefile.in
+++ b/comms/klog/files/patch-Makefile.in
@@ -1,11 +1,96 @@
---- Makefile.in.orig	Tue Apr 26 01:39:03 2005
-+++ Makefile.in	Wed Sep 14 12:22:15 2005
-@@ -274,7 +274,7 @@
- 
- MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
- applnkApplication_DATA = klog.desktop
--applnkApplicationdir = $(kde_appsdir)/Application
-+applnkApplicationdir = $(kde_appsdir)/Applications
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+--- Makefile.in.orig	Sat Jan  7 14:03:58 2006
++++ Makefile.in	Thu May  4 02:07:19 2006
+@@ -161,7 +161,7 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-TOPSUBDIRS = @TOPSUBDIRS@
++TOPSUBDIRS = src doc
+ UIC = @UIC@
+ UIC_TR = @UIC_TR@
+ USER_INCLUDES = @USER_INCLUDES@
+@@ -295,26 +295,26 @@
+ 
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++#$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --gnu  Makefile
+ #>+ 3
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
+-	cd $(top_srcdir) && perl admin/am_edit Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+-
+-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++#	cd $(top_srcdir) && \
++#	  $(AUTOMAKE) --gnu  Makefile
++#	cd $(top_srcdir) && perl admin/am_edit Makefile.in
++#Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
++#	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
++
++#$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++#	$(SHELL) ./config.status --recheck
++#$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ #>- 	cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+-	cd $(srcdir) && rm -f configure
+-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
++#	cd $(srcdir) && rm -f configure
++#	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+ 
+-$(ACLOCAL_M4):  configure.in acinclude.m4
+-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++#$(ACLOCAL_M4):  configure.in acinclude.m4
++#	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.h: stamp-h1
+ 	@if test ! -f $@; then \
+@@ -326,9 +326,9 @@
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+ 
+-$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOHEADER)
+-	touch $(srcdir)/config.h.in
++#$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++#	cd $(top_srcdir) && $(AUTOHEADER)
++#	touch $(srcdir)/config.h.in
+ 
+ distclean-hdr:
+ 	-rm -f config.h stamp-h1
+@@ -701,8 +701,8 @@
+ 	uninstall-info-recursive uninstall-recursive
+ 
+ 
+-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
+-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
++#$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
++#	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
+ 
+ $(top_srcdir)/subdirs:
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
+@@ -712,7 +712,7 @@
+ 
+ package-messages:
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
+-	$(MAKE) -C po merge
++	$(MAKE) -C merge
+ 
+ dist-hook:
+ 	cd $(top_distdir) && perl admin/am_edit -padmin
+@@ -721,8 +721,9 @@
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+ 
++
+ #>+ 2
+-KDE_DIST=stamp-h.in subdirs Makefile.in configure.files klog.kdevelop.pcs Makefile.cvs klog.kdevses klog.kdevelop Doxyfile 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files Makefile.cvs configure.lineno 
+ 
+ #>+ 2
+ docs-am:
diff --git a/comms/klog/files/patch-doc_Makefile.in b/comms/klog/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..8bc1b3a820f5
--- /dev/null
+++ b/comms/klog/files/patch-doc_Makefile.in
@@ -0,0 +1,33 @@
+--- doc/Makefile.in.orig	Sat Jan  7 14:03:58 2006
++++ doc/Makefile.in	Thu May  4 01:00:17 2006
+@@ -290,15 +290,15 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++#$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --gnu  doc/Makefile
+ #>+ 3
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++#	cd $(top_srcdir) && \
++#	  $(AUTOMAKE) --gnu  doc/Makefile
++#	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
++#Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
++#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -435,7 +435,7 @@
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+ top_distdir = ..
+ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
diff --git a/comms/klog/files/patch-doc_en_Makefile.in b/comms/klog/files/patch-doc_en_Makefile.in
new file mode 100644
index 000000000000..046910c5a0d9
--- /dev/null
+++ b/comms/klog/files/patch-doc_en_Makefile.in
@@ -0,0 +1,28 @@
+--- doc/en/Makefile.in.orig	Sat Jan  7 14:03:58 2006
++++ doc/en/Makefile.in	Thu May  4 02:01:10 2006
+@@ -274,11 +274,11 @@
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --gnu  doc/en/Makefile
+ #>+ 3
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/en/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++#	cd $(top_srcdir) && \
++#	  $(AUTOMAKE) --gnu  doc/en/Makefile
++#	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
++#Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
++#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -297,7 +297,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DISTFILES = $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+ top_distdir = ../..
+ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
diff --git a/comms/klog/files/patch-src_Makefile.in b/comms/klog/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..aa2f76fb3ea9
--- /dev/null
+++ b/comms/klog/files/patch-src_Makefile.in
@@ -0,0 +1,42 @@
+--- src/Makefile.in.orig	Sun Jan 15 14:40:13 2006
++++ src/Makefile.in	Thu May  4 02:28:53 2006
+@@ -111,7 +111,7 @@
+ LIBS = @LIBS@
+ LIBSM = @LIBSM@
+ LIBSOCKET = @LIBSOCKET@
+-LIBTOOL = @LIBTOOL@
++LIBTOOL = libtool
+ LIBUCB = @LIBUCB@
+ LIBUTIL = @LIBUTIL@
+ LIBZ = @LIBZ@
+@@ -396,7 +396,7 @@
+ 
+ HEADERS = $(noinst_HEADERS)
+ 
+-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
++DIST_COMMON = $(noinst_HEADERS)
+ SOURCES = $(klog_SOURCES)
+ 
+ #>- all: all-am
+@@ -405,15 +405,15 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
++#$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ #>- 	cd $(top_srcdir) && \
+ #>- 	  $(AUTOMAKE) --gnu  src/Makefile
+ #>+ 3
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  src/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
+-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++#	cd $(top_srcdir) && \
++#	  $(AUTOMAKE) --gnu  src/Makefile
++#	cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
++#Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
++#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
diff --git a/comms/klog/pkg-descr b/comms/klog/pkg-descr
index eab3e23da9c1..b240f0a2d5a0 100644
--- a/comms/klog/pkg-descr
+++ b/comms/klog/pkg-descr
@@ -2,6 +2,6 @@ Klog is an ADIF (amateur data interchage format) compatible
 loging application. It does, amongst other things, awards
 tracking, DX cluster access and dupe checking.
 
-WWW: http://klog.berlios.de/
+WWW: http://developer.berlios.de/projects/klog/
 
 -MattD..
diff --git a/comms/klog/pkg-plist b/comms/klog/pkg-plist
index dca169860a94..552094f343de 100644
--- a/comms/klog/pkg-plist
+++ b/comms/klog/pkg-plist
@@ -1,11 +1,21 @@
 bin/klog
 share/applnk/Applications/klog.desktop
+share/applnk/Utilities/klog.desktop
+share/apps/klog/klogui.rc
 share/doc/HTML/en/klog/common
 share/doc/HTML/en/klog/index.cache.bz2
 share/doc/HTML/en/klog/index.docbook
+share/icons/hicolor/16x16/apps/klog.png
+share/icons/hicolor/32x32/apps/klog.png
 share/icons/locolor/16x16/apps/klog.png
 share/icons/locolor/32x32/apps/klog.png
+@dirrm share/apps/klog
 @dirrm share/doc/HTML/en/klog
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps