ports/82969: [patch] deskutils/kchm bugfix

[Linas Valiukas]

>Number:         82969
>Category:       ports
>Synopsis:       [patch] deskutils/kchm bugfix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 04 09:40:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Linas Valiukas
>Release:        FreeBSD 5.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD shirshegsm.lan13.satnet.lt 5.4-RELEASE-p1 FreeBSD 
5.4-RELEASE-p1 #0: Wed Jun 1 00:11:23 EEST 2005 
root at shirshegsm.lan13.satnet.lt:/usr/obj/usr/src/sys/HUBBLE i386

>Description:
	- added SourceForge as a mirror list;
	- fixed pkg-plist;
	- added some patches, now kchm doesn't overwrite include/chm_lib.h
>How-To-Repeat:

>Fix:


diff -ruN kchm.old/Makefile kchm/Makefile
--- kchm.old/Makefile	Mon Jun 20 19:32:37 2005
+++ kchm/Makefile	Mon Jul  4 12:08:02 2005
@@ -7,9 +7,10 @@
 
 PORTNAME=	kchm
 PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde
-MASTER_SITES=	http://mesh.dl.sourceforge.net/sourceforge/kchmnew/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=kchmnew
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shirshegsm at gmail.com
diff -ruN kchm.old/files/patch-libchm++-Makefile.am 
kchm/files/patch-libchm++-Makefile.am
--- kchm.old/files/patch-libchm++-Makefile.am	Thu Jan  1 03:00:00 1970
+++ kchm/files/patch-libchm++-Makefile.am	Mon Jul  4 12:08:02 2005
@@ -0,0 +1,13 @@
+--- libchm++/Makefile.am.bak	Tue Mar 15 18:29:13 2005
++++ libchm++/Makefile.am	Mon Jul  4 11:54:20 2005
+@@ -4,8 +4,8 @@
+ 
+ lib_LTLIBRARIES = libchmmix.la
+ libchmmix_la_LDFLAGS = 
+-libchmmix_la_SOURCES = chm_lib.c chm_lib.h lzx.c lzx.h chm.cpp chmxx.h 
tagreader.cpp tagreader.h
+-include_HEADERS =  chmxx.h chm_lib.h lzx.h
++libchmmix_la_SOURCES = chm_lib.c lzx.c lzx.h chm.cpp chmxx.h tagreader.cpp 
tagreader.h
++include_HEADERS =  chmxx.h lzx.h
+ 
+ AM_CXXFLAGS = -D_REENTRANT
+ 
diff -ruN kchm.old/files/patch-libchm++-Makefile.in 
kchm/files/patch-libchm++-Makefile.in
--- kchm.old/files/patch-libchm++-Makefile.in	Thu Jan  1 03:00:00 1970
+++ kchm/files/patch-libchm++-Makefile.in	Mon Jul  4 12:08:02 2005
@@ -0,0 +1,13 @@
+--- libchm++/Makefile.in.bak	Thu Mar 17 19:42:53 2005
++++ libchm++/Makefile.in	Mon Jul  4 11:55:14 2005
+@@ -344,8 +344,8 @@
+ AM_CFLAGS = -DCHM_MT -DDMALLOC_DISABLE
+ lib_LTLIBRARIES = libchmmix.la
+ libchmmix_la_LDFLAGS = 
+-libchmmix_la_SOURCES = chm_lib.c chm_lib.h lzx.c lzx.h chm.cpp chmxx.h 
tagreader.cpp tagreader.h
+-include_HEADERS = chmxx.h chm_lib.h lzx.h
++libchmmix_la_SOURCES = chm_lib.c lzx.c lzx.h chm.cpp chmxx.h tagreader.cpp 
tagreader.h
++include_HEADERS = chmxx.h lzx.h
+ AM_CXXFLAGS = -D_REENTRANT
+ EXTRA_DIST = *.h
+ #>- all: all-am
diff -ruN kchm.old/pkg-plist kchm/pkg-plist
--- kchm.old/pkg-plist	Mon Jun 20 19:32:37 2005
+++ kchm/pkg-plist	Mon Jul  4 12:08:02 2005
@@ -7,7 +7,6 @@
 lib/kde3/kio_chmnew.la
 lib/kde3/kio_chmnew.so
 include/chmxx.h
-include/chm_lib.h
 include/lzx.h
 share/mimelnk/application/chmmime.desktop
 share/services/chmnew.protocol
@@ -23,3 +22,4 @@
 share/servicetypes/kchm.desktop
 @dirrm share/apps/chmnewpart
 @dirrm share/apps/chmnew
+ at dirrm share/apps/kchm


>Release-Note:
>Audit-Trail:
>Unformatted: