Bug 105146 - Port upgrade: kdiff3 to 0.9.91
Summary: Port upgrade: kdiff3 to 0.9.91
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-11-04 17:53 UTC by Heiner
Modified: 2006-11-05 18:30 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Heiner 2006-11-04 17:53:37 UTC
See Patch.

Heiner

Fix: --Boundary-00=_NoLTFhBRmTnsnAm
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="kdiff3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="kdiff3.diff"



--Boundary-00=_NoLTFhBRmTnsnAm----LnbX18LvwQosrqI7EAg0cpjK1hwFV5VZdA6N3u9qnG01P2FK
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN ../../textproc/kdiff3/Makefile ./Makefile
--- ../../textproc/kdiff3/Makefile	Mon Jun  5 07:56:03 2006
+++ ./Makefile	Sat Nov  4 16:37:44 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdiff3
-PORTVERSION=	0.9.90
+PORTVERSION=	0.9.91
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,14 +21,5 @@
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
 MAN1=	kdiff3.1
-
-pre-configure:
-.for i in config.h.in Makefile.in
-	${TOUCH} ${WRKSRC}/${i}
-.endfor
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2 ||g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff -urN ../../textproc/kdiff3/distinfo ./distinfo
--- ../../textproc/kdiff3/distinfo	Mon Jun  5 07:56:03 2006
+++ ./distinfo	Sat Nov  4 16:33:45 2006
@@ -1,3 +1,3 @@
-MD5 (kdiff3-0.9.90.tar.gz) = 7224d636e1f1fa577abfbc17192e71bd
-SHA256 (kdiff3-0.9.90.tar.gz) = 39ce3880a4ff586a96460dac32a483cc081979ffcc82508ea39ace4f39ce6000
-SIZE (kdiff3-0.9.90.tar.gz) = 1846495
+MD5 (kdiff3-0.9.91.tar.gz) = e56613506475f23b8ab713f325dea6e3
+SHA256 (kdiff3-0.9.91.tar.gz) = b22deb1ed23049b303427d8ac81d1e6010166fd6d5eb1dbdd6a075ee770ad9d3
+SIZE (kdiff3-0.9.91.tar.gz) = 2173290
diff -urN ../../textproc/kdiff3/pkg-plist ./pkg-plist
--- ../../textproc/kdiff3/pkg-plist	Mon Jun  5 07:56:03 2006
+++ ./pkg-plist	Sat Nov  4 16:49:19 2006
@@ -219,15 +219,31 @@
 share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
 share/services/kdiff3part.desktop
 @dirrm share/doc/HTML/sv/kdiff3
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/kdiff3
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/kdiff3
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/kdiff3
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/kdiff3
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/et/kdiff3
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/es/kdiff3
+@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kdiff3
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kdiff3
+@dirrmtry share/doc/HTML/de
 @dirrm share/doc/HTML/da/kdiff3
+@dirrmtry share/doc/HTML/da
 @dirrm share/doc/HTML/kdiff3
+@dirrmtry share/doc/HTML
+@dirrmtry share/doc
 @dirrm share/apps/kdiff3part
 @dirrm share/apps/kdiff3
+@dirrmtry share/apps
+@dirrmtry share/applnk/Development
+@dirrmtry share/applnk
+@dirrmtry share
Comment 1 Martin Wilke freebsd_committer 2006-11-04 18:31:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 Martin Wilke freebsd_committer 2006-11-05 12:20:22 UTC
State Changed
From-To: open->feedback

Ask for maintainer fix.
Comment 3 dfilter service freebsd_committer 2006-11-05 18:29:13 UTC
miwi        2006-11-05 18:29:07 UTC

  FreeBSD ports repository

  Modified files:
    textproc/kdiff3      Makefile distinfo pkg-plist 
  Added files:
    textproc/kdiff3/files patch-src-mergeresultwindow.cpp 
  Log:
  - Update to 0.9.91
  
  PR:             ports/105146
  Submitted by:   Heiner <h.eichmann@gmx.de> (maintainer)
  Sponsored by:   FreeBSD Bug-a-thon #2
  
  Revision  Changes    Path
  1.23      +1 -10     ports/textproc/kdiff3/Makefile
  1.13      +3 -3      ports/textproc/kdiff3/distinfo
  1.1       +11 -0     ports/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp (new)
  1.11      +16 -0     ports/textproc/kdiff3/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Martin Wilke freebsd_committer 2006-11-05 18:29:18 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!