4 files changed, 25 insertions, 29 deletions

diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 06a281c12a44..b440b85f2a61 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	dedit
-PORTVERSION=	0.6.2.1
+PORTVERSION=	0.6.2.3
 CATEGORIES=	editors gnome
-MASTER_SITES=	ftp://ftp.debian.org/debian/dists/woody/main/source/editors/
+MASTER_SITES=	ftp://ftp.debian.org/debian/pool/main/d/dedit/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -21,21 +21,19 @@ USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+		LIBS="-L${LOCALBASE}/lib -lgiconv"
 
 MAN1=		dedit.1
-.if defined(KANJI)
 MANLANG=	"" ja
-.endif
 
 pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g'
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|dedit.ja.1||'
+	@find ${WRKSRC} -name "*.c" | xargs ${PERL} -pi -e \
+		's|<iconv.h>|<giconv.h>|g'
 
 post-install:
-.if defined(KANJI)
-	${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 \
-	${PREFIX}/man/ja/man1/dedit.1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1
 
 .include <bsd.port.mk>
diff --git a/editors/dedit/distinfo b/editors/dedit/distinfo
index 0e3bdcc426a1..e25608b7694f 100644
--- a/editors/dedit/distinfo
+++ b/editors/dedit/distinfo
@@ -1 +1 @@
-MD5 (dedit_0.6.2.1.tar.gz) = 1370a3f1beedb9cdf22608165ef4f92f
+MD5 (dedit_0.6.2.3.tar.gz) = f4b52e1f7e9f905c48166794a5aada03
diff --git a/editors/dedit/files/patch-ae b/editors/dedit/files/patch-ae
index b408144370ce..18590a39bebe 100644
--- a/editors/dedit/files/patch-ae
+++ b/editors/dedit/files/patch-ae
@@ -1,6 +1,15 @@
---- configure.orig	Fri Aug 11 17:27:06 2000
-+++ configure	Wed Aug 23 00:14:49 2000
-@@ -4109,7 +4109,7 @@
+--- configure.orig	Thu Nov 16 13:40:48 2000
++++ configure	Wed Oct 31 03:46:15 2001
+@@ -2879,7 +2879,7 @@
+ fi
+ done
+ 
+-for ac_hdr in iconv.h
++for ac_hdr in giconv.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -4295,7 +4295,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,7 +18,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -4383,7 +4383,7 @@
+@@ -4569,7 +4569,7 @@
         fi
         for lang in $LINGUAS; do
           case "$ALL_LINGUAS" in
@@ -18,7 +27,7 @@
           esac
         done
         LINGUAS=$NEW_LINGUAS
-@@ -4482,7 +4482,7 @@
+@@ -4668,7 +4668,7 @@
  	< $srcdir/po/POTFILES.in > po/POTFILES
    
  
@@ -26,4 +35,4 @@
 +localedir=$prefix/share/locale
  
  
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+ gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
diff --git a/editors/dedit/files/patch-af b/editors/dedit/files/patch-af
deleted file mode 100644
index 3d63e1a5c5e8..000000000000
--- a/editors/dedit/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Fri Aug 11 17:27:25 2000
-+++ doc/Makefile.in	Wed Aug 23 00:12:50 2000
-@@ -110,7 +110,7 @@
- l = @l@
- localedir = @localedir@
- 
--man_MANS = dedit.1 dedit.ja.1
-+man_MANS = dedit.1
- EXTRA_DIST = $(man_MANS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h