Attachment 82957 Details for Bug 118595 – file.diff

[patch] file.diff

file.diff (text/plain), 11.88 KB, created by tkato432 on 2007-12-12 18:30:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2007-12-12 18:30:07 UTC

Size: 11.88 KB

patch

obsolete

>diff -urN /usr/ports/comms/klog/Makefile comms/klog/Makefile
>--- /usr/ports/comms/klog/Makefile	Sun May 20 05:00:54 2007
>+++ comms/klog/Makefile	Thu Nov  1 12:30:15 2007
>@@ -5,26 +5,29 @@
> # $FreeBSD: ports/comms/klog/Makefile,v 1.15 2007/05/19 20:00:54 flz Exp $
> 
> PORTNAME=	klog
>-PORTVERSION=	0.3.3
>-PORTREVISION=	2
>+PORTVERSION=	0.4.2
> CATEGORIES=	comms hamradio
>-MASTER_SITES=	${MASTER_SITE_BERLIOS}
>-MASTER_SITE_SUBDIR=	klog
>+MASTER_SITES=	BERLIOS
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	ADIF compatible logging application
>+COMMENT=	A ham radio logging application for KDE
> 
>-LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib
>+LIB_DEPENDS=	hamlib.2:${PORTSDIR}/comms/hamlib
> 
>-USE_AUTOTOOLS=	libtool:15
>-INSTALLS_ICONS=	yes
>+USE_KDELIBS_VER=	3
> USE_GMAKE=	yes
>-USE_KDELIBS_VER=3
>+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
>+GNU_CONFIGURE=	yes
>+INSTALLS_ICONS=	yes
> 
>-DOCSDIR=share/doc/HTML
>+post-extract:
>+	@${RM} -f ${WRKSRC}/po/gl.po
> 
>-post-install:
>-	@${INSTALL_DATA}	${WRKSRC}/src/klog.desktop \
>-		 ${PREFIX}/share/applnk/Applications/klog.desktop
>+pre-configure:
>+	@cd ${WRKSRC} \
>+		&& ${RM} -f admin/libtool.m4.in admin/ltmain.sh \
>+		&& ${CP} -f ${LIBTOOL_M4} admin/libtool.m4.in \
>+		&& ${CP} -f ${LTMAIN} admin/ltmain.sh \
>+		&& ${SETENV} ${MAKE_ENV} ${GMAKE} -f admin/Makefile.common
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/comms/klog/distinfo comms/klog/distinfo
>--- /usr/ports/comms/klog/distinfo	Mon Oct  9 03:42:45 2006
>+++ comms/klog/distinfo	Thu Nov  1 02:27:36 2007
>@@ -1,3 +1,3 @@
>-MD5 (klog-0.3.3.tar.gz) = c948bbe70c9d475f0299171f9175488a
>-SHA256 (klog-0.3.3.tar.gz) = e23bf0dd37ac1b28a20a6e2ba5a61b089ca5c9736ca545d38e7b865cae8992bb
>-SIZE (klog-0.3.3.tar.gz) = 635599
>+MD5 (klog-0.4.2.tar.gz) = 67b46284ac867f0ab3c801a9b003585b
>+SHA256 (klog-0.4.2.tar.gz) = bdb0f2077468a8c5958b0c4ac1512319e02a505eb3cc897b1d3d5eb6eb6df2e1
>+SIZE (klog-0.4.2.tar.gz) = 776550
>diff -urN /usr/ports/comms/klog/files/patch-Makefile.in comms/klog/files/patch-Makefile.in
>--- /usr/ports/comms/klog/files/patch-Makefile.in	Mon Oct  9 03:42:45 2006
>+++ comms/klog/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,96 +0,0 @@
>---- 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 -urN /usr/ports/comms/klog/files/patch-doc_Makefile.in comms/klog/files/patch-doc_Makefile.in
>--- /usr/ports/comms/klog/files/patch-doc_Makefile.in	Mon Oct  9 03:42:45 2006
>+++ comms/klog/files/patch-doc_Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,33 +0,0 @@
>---- 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 -urN /usr/ports/comms/klog/files/patch-doc_en_Makefile.in comms/klog/files/patch-doc_en_Makefile.in
>--- /usr/ports/comms/klog/files/patch-doc_en_Makefile.in	Mon Oct  9 03:42:45 2006
>+++ comms/klog/files/patch-doc_en_Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,28 +0,0 @@
>---- 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 -urN /usr/ports/comms/klog/files/patch-src_Makefile.in comms/klog/files/patch-src_Makefile.in
>--- /usr/ports/comms/klog/files/patch-src_Makefile.in	Mon Oct  9 03:42:45 2006
>+++ comms/klog/files/patch-src_Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,42 +0,0 @@
>---- 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 -urN /usr/ports/comms/klog/pkg-descr comms/klog/pkg-descr
>--- /usr/ports/comms/klog/pkg-descr	Mon Oct  9 03:42:45 2006
>+++ comms/klog/pkg-descr	Thu Nov  1 12:25:06 2007
>@@ -1,7 +1,5 @@
>-Klog is an ADIF (amateur data interchage format) compatible
>-loging application. It does, amongst other things, awards
>-tracking, DX cluster access and dupe checking.
>+KLog is a Ham Radio Logging program for KDE. It manages QSL, awards, DXCC,
>+WAS, TPEA, (local awards), IOTA, has a dxcluster client, import and export
>+from different format and works with ADIF by default.
> 
> WWW: http://developer.berlios.de/projects/klog/
>-
>--MattD..
>diff -urN /usr/ports/comms/klog/pkg-plist comms/klog/pkg-plist
>--- /usr/ports/comms/klog/pkg-plist	Thu Jan  4 05:50:53 2007
>+++ comms/klog/pkg-plist	Thu Nov  1 12:17:53 2007
>@@ -1,16 +1,21 @@
> bin/klog
>-share/applnk/Applications/klog.desktop
> share/applnk/Utilities/klog.desktop
> share/apps/klog/klogui.rc
>-%%DOCSDIR%%/en/klog/common
>-%%DOCSDIR%%/en/klog/index.cache.bz2
>-%%DOCSDIR%%/en/klog/index.docbook
>+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
>+share/locale/de/LC_MESSAGES/klog.mo
>+share/locale/es/LC_MESSAGES/klog.mo
>+share/locale/pt/LC_MESSAGES/klog.mo
>+share/locale/pt_BR/LC_MESSAGES/klog.mo
>+share/locale/sr/LC_MESSAGES/klog.mo
>+share/locale/sv/LC_MESSAGES/klog.mo
> @dirrm share/apps/klog
>-@dirrm %%DOCSDIR%%/en/klog
>+@dirrm share/doc/HTML/en/klog
> @dirrmtry share/icons/locolor/32x32/apps
> @dirrmtry share/icons/locolor/32x32
> @dirrmtry share/icons/locolor/16x16/apps

Actions: View | Diff

Attachments on bug 118595: 82957