6 files changed, 33 insertions, 36 deletions

diff --git a/UPDATING b/UPDATING
index 827e10a7badc..7b1e8a86e9ff 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20111025:
+  AFFECTS: users of print/flpsed or www/dillo2
+  AUTHOR: bf@FreeBSD.org
+
+  The new versions of flpsed and dillo have switched from
+  x11-toolkits/fltk2 to the new fltk 1.3.0 from x11-toolkits/fltk.
+  Users who have customizations specific to fltk2 may need to consult
+  the fltk 1.3 documents in order to adjust their local settings. For
+  dillo, some commonly-used key bindings have changed, and new
+  configuration options are available: consult dillorc.dist and
+  keysrc.dist for details.
+
 20111019:
   AFFECTS: users of mail/thunderbird or www/seamonkey with lightning 
            plugin installed.
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 4f2bada3ee95..73b8a94968e0 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	flpsed
-PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTVERSION=	0.7.0
 CATEGORIES=	print
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	WYSIWYG Postscript pseudo-editor
+COMMENT=	WYSIWYG Postscript annotator
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libfltk2.a:${PORTSDIR}/x11-toolkits/fltk2
-RUN_DEPENDS+=	${LOCALBASE}/lib/libfltk2.a:${PORTSDIR}/x11-toolkits/fltk2
+LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
 USE_GHOSTSCRIPT=yes
@@ -26,8 +24,8 @@ MAN1=		flpsed.1
 PORTDOCS=	README
 
 post-configure:
-	@${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		"s|-lpthread|${PTHREAD_LIBS}|g"
+	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} \
+	${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/flpsed ${PREFIX}/bin
diff --git a/print/flpsed/distinfo b/print/flpsed/distinfo
index 392b7bcbdd38..1f2522f193a2 100644
--- a/print/flpsed/distinfo
+++ b/print/flpsed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flpsed-0.6.1.tar.gz) = f5ff37f8d87ccdcd8c019047c84a29bc38eec78883feccf60f8fd892616def01
-SIZE (flpsed-0.6.1.tar.gz) = 102349
+SHA256 (flpsed-0.7.0.tar.gz) = aedb5c96dfdcbe260d133f9b674a98d9948a1614d76ce623acb57503f2850b38
+SIZE (flpsed-0.7.0.tar.gz) = 119159
diff --git a/print/flpsed/pkg-descr b/print/flpsed/pkg-descr
index 0a6d40df3e19..b6b35b9a42a9 100644
--- a/print/flpsed/pkg-descr
+++ b/print/flpsed/pkg-descr
@@ -1,22 +1,12 @@
-flpsed is a WYSIWYG PostScript pseudo-editor.  "Pseudo", because you
-can't remove or modify existing elements of a document, only add
-arbitrary text lines to existing PostScript documents.  Added
-lines can later be reedited with flpsed.
+flpsed is a WYSIWYG PostScript annotator.  flpsed can add arbitrary text lines
+to existing PostScript documents, but cannot remove or modify existing elements
+of such documents. The added lines can later be re-edited with flpsed, either
+interactively or via batch-processing (the latter is useful for repeatedly
+filling in forms). Text lines can also be imported from other documents that
+have been modified with flpsed.
 
 Using pdftops, which is part of xpdf, one can convert PDF documents to
-PostScript and then add text to them using flpsed.  flpsed is thus useful
-for filling in forms, adding notes, etc.
-
-Features:
-
-    * Add arbitrary text to existing PostScript documents.
-    * Reedit text that has been added with flpsed.
-    * The overall structure of the PostScript document is not modified.
-      flpsed only adds the additional text.
-    * Batch processing (no X11 required) to modify tagged text lines that
-      have been entered interactively with flpsed before.  This is very
-      useful for repeatedly filling in forms.
-    * Text lines can be imported from other flpsed-modified documents.
-    * Import and export PDF.  Therefore it can be used as a PDF editor.
+PostScript and then add text to them using flpsed.  flpsed is thus useful for
+filling in forms, adding notes, etc.
 
 WWW: http://www.ecademix.com/JohannesHofmann/flpsed.html
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 0a153f4de402..ecd424022158 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -5,20 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	dillo
-PORTVERSION=	2.2.1
+PORTVERSION=	3.0.1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.dillo.org/download/ LOCAL/bf
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	A fast, small graphical Web browser built upon fltk2
+COMMENT=	A fast, small graphical Web browser built upon fltk
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libfltk2.a:${PORTSDIR}/x11-toolkits/fltk2
-RUN_DEPENDS=	${LOCALBASE}/lib/libfltk2.a:${PORTSDIR}/x11-toolkits/fltk2 \
-		wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/dillo2/distinfo b/www/dillo2/distinfo
index 3e3663d2bf45..cde327c3125f 100644
--- a/www/dillo2/distinfo
+++ b/www/dillo2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dillo-2.2.1.tar.bz2) = 70c5768abe8234ffc65a833c8b663f30f115011096367d63a2a0fa39d5df7181
-SIZE (dillo-2.2.1.tar.bz2) = 633999
+SHA256 (dillo-3.0.1.tar.bz2) = 3e49e6ffc237792b97576bb324f6dc7e49b91f464e5de67b1dd2a811cdab73f3
+SIZE (dillo-3.0.1.tar.bz2) = 625504