5 files changed, 26 insertions, 23 deletions

diff --git a/www/Makefile b/www/Makefile
index e6416f10f003..f10341198bc4 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -258,6 +258,7 @@
     SUBDIR += kdedict
     SUBDIR += kdewebdev
     SUBDIR += knowledgekit
+    SUBDIR += kompozer
     SUBDIR += larbin
     SUBDIR += libapreq2
     SUBDIR += libghttp
diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index de02b843e706..17104cce2a56 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -6,26 +6,27 @@
 #    $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $
 #
 
-PORTNAME=	nvu
-DISTVERSION=	1.0
-PORTREVISION=	5
+PORTNAME=	kompozer
+DISTVERSION=	0.7.10
 CATEGORIES=	www
-MASTER_SITES=	http://cvs.nvu.com/download/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-sources
+MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-${DISTVERSION}dfsg-src
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A complete Web Authoring System similar to Dreamweaver or Frontpage
+COMMENT=	Complete Web Authoring Suite
 
-USE_BZIP2=	yes
 WANT_GNOME=	yes
 WANT_PERL=	yes
 USE_GMAKE=	yes
-NVU=		${PORTNAME}-${DISTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}/mozilla
 MAKEFILE=	client.mk
 ALL_TARGET=	build_all
-MOZ_EXTENSIONS=	wallet,xml-rpc,xmlextras,pref,universalchardet,editor/cascades,spellcheck
+MOZ_EXTENSIONS=	wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
 PORT_MOZCONFIG=	${WRKSRC}/composer/config/mozconfig.linux
-CFLAGS+=	-I${X11BASE}/include
+
+DESKTOP_ENTRIES="Kompozer" "${COMMENT}" \
+		"${PREFIX}/lib/kompozer/icons/mozicon50.xpm" "${PORTNAME}" \
+		"Application;Network;" true
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/mozilla/Makefile.common"
diff --git a/www/kompozer/distinfo b/www/kompozer/distinfo
index fad90f1656fe..5f1b2f8b87fc 100644
--- a/www/kompozer/distinfo
+++ b/www/kompozer/distinfo
@@ -1,3 +1,3 @@
-MD5 (nvu-1.0-sources.tar.bz2) = ae0f7c85e230ce8a90dc438b53be06e6
-SHA256 (nvu-1.0-sources.tar.bz2) = 9ec892e352c3596a4f734a885c6e085028574714cf0d44c2dac32b0d89b4b630
-SIZE (nvu-1.0-sources.tar.bz2) = 29687976
+MD5 (kompozer-0.7.10dfsg-src.tar.gz) = 422675f098bae8cbd1e4d35cae426855
+SHA256 (kompozer-0.7.10dfsg-src.tar.gz) = 90978b89b745f8b91b40b8b6f8748169d0a811084283a3945b370173f96a6b42
+SIZE (kompozer-0.7.10dfsg-src.tar.gz) = 35284737
diff --git a/www/kompozer/files/patch-config_autoconf.mk.in b/www/kompozer/files/patch-config_autoconf.mk.in
index 29fe7f8fbde0..8619ca97cfea 100644
--- a/www/kompozer/files/patch-config_autoconf.mk.in
+++ b/www/kompozer/files/patch-config_autoconf.mk.in
@@ -1,17 +1,18 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
+--- config/autoconf.mk.in.orig	2007-08-22 07:20:23.000000000 -0400
++++ config/autoconf.mk.in	2007-10-08 12:39:06.000000000 -0400
+@@ -32,13 +32,13 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-includedir	= @includedir@/$(MOZ_APP_NAME)
 +includedir	= @includedir@/%%MOZILLA%%
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)
++idldir		= @datadir@/idl/%%MOZILLA%%
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)
 +mozappdir	= $(libdir)/%%MOZILLA%%
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
diff --git a/www/kompozer/pkg-descr b/www/kompozer/pkg-descr
index 1789660035a9..3af80403d372 100644
--- a/www/kompozer/pkg-descr
+++ b/www/kompozer/pkg-descr
@@ -1,6 +1,6 @@
-Nvu is a complete Web Authoring System that combines web file management and
-easy-to-use WYSIWYG web page editing.  Nvu is based on the Mozilla Firefox
-codebase and is designed to be extremely easy to use, making it ideal for 
+Complete Web Authoring System that combines web file management and easy-to-use
+WYSIWYG web page editing. Kompozer (formally Nvu) is based on the Firefox
+codebase and is designed to be extremely easy to use, making it ideal for
 non-technical computer users who want to create an attractive, professional
 looking web site without needing to know HTML or web coding.
 
@@ -15,4 +15,4 @@ Features:
  - Cleaner markup
  - Visible marks
 
-WWW: http://www.nvu.com/
+WWW: http://www.kompozer.net/