Attachment 70410 Details for Bug 102751 – klog-0.3.3.patch

[patch] klog-0.3.3.patch

klog-0.3.3.patch (text/plain), 11.15 KB, created by Diane Bruce on 2006-09-01 16:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Diane Bruce

Created: 2006-09-01 16:10:17 UTC

Size: 11.15 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/comms/klog/Makefile /usr/home/db/klog/Makefile
>--- /usr/ports/comms/klog/Makefile	Fri Feb 24 18:15:46 2006
>+++ /usr/home/db/klog/Makefile	Fri Sep  1 10:51:51 2006
>@@ -5,10 +5,10 @@
> # $FreeBSD: ports/comms/klog/Makefile,v 1.11 2006/02/23 10:34:57 ade Exp $
> 
> 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
>@@ -18,5 +18,9 @@
> 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 -ruN --exclude=CVS /usr/ports/comms/klog/distinfo /usr/home/db/klog/distinfo
>--- /usr/ports/comms/klog/distinfo	Wed Feb 15 22:28:49 2006
>+++ /usr/home/db/klog/distinfo	Tue May  2 16:49:31 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/comms/klog/files/patch-Makefile.in /usr/home/db/klog/files/patch-Makefile.in
>--- /usr/ports/comms/klog/files/patch-Makefile.in	Wed Sep 28 04:01:14 2005
>+++ /usr/home/db/klog/files/patch-Makefile.in	Thu May  4 02:07:39 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/comms/klog/files/patch-doc_Makefile.in /usr/home/db/klog/files/patch-doc_Makefile.in
>--- /usr/ports/comms/klog/files/patch-doc_Makefile.in	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/klog/files/patch-doc_Makefile.in	Thu May  4 01:00:21 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/comms/klog/files/patch-doc_en_Makefile.in /usr/home/db/klog/files/patch-doc_en_Makefile.in
>--- /usr/ports/comms/klog/files/patch-doc_en_Makefile.in	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/klog/files/patch-doc_en_Makefile.in	Thu May  4 02:01:19 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/comms/klog/files/patch-src_Makefile.in /usr/home/db/klog/files/patch-src_Makefile.in
>--- /usr/ports/comms/klog/files/patch-src_Makefile.in	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/klog/files/patch-src_Makefile.in	Thu May  4 02:29:01 2006
>@@ -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 -ruN --exclude=CVS /usr/ports/comms/klog/pkg-descr /usr/home/db/klog/pkg-descr
>--- /usr/ports/comms/klog/pkg-descr	Sun Jul 25 09:25:43 2004
>+++ /usr/home/db/klog/pkg-descr	Fri Sep  1 10:29:13 2006
>@@ -2,6 +2,6 @@
> 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 -ruN --exclude=CVS /usr/ports/comms/klog/pkg-plist /usr/home/db/klog/pkg-plist
>--- /usr/ports/comms/klog/pkg-plist	Wed Feb 15 22:28:49 2006
>+++ /usr/home/db/klog/pkg-plist	Fri Sep  1 10:53:41 2006
>@@ -5,7 +5,7 @@
> share/doc/HTML/en/klog/index.docbook
> share/icons/locolor/16x16/apps/klog.png
> share/icons/locolor/32x32/apps/klog.png
>-@dirrm share/doc/HTML/en/klog
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrmtry share/icons/locolor/32x32/apps
> @dirrmtry share/icons/locolor/32x32
> @dirrmtry share/icons/locolor/16x16/apps

Actions: View | Diff

Attachments on bug 102751: 70410