Date: Tue, 22 Jan 2002 13:19:08 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/34182: Update port: editors/dedit to 0.6.2.3 (fix ports/31645) Message-ID: <200201222119.g0MLJ8301430@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 34182 >Category: ports >Synopsis: Update port: editors/dedit to 0.6.2.3 (fix ports/31645) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 22 13:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.6.2.3 Remove file: files/patch-af This PR supersedes ports/31645. >How-To-Repeat: >Fix: idiff -urN /usr/ports/editors/dedit/Makefile editors/dedit/Makefile --- /usr/ports/editors/dedit/Makefile Mon Feb 12 05:23:28 2001 +++ editors/dedit/Makefile Wed Jan 23 05:57:02 2002 @@ -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_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 -urN /usr/ports/editors/dedit/distinfo editors/dedit/distinfo --- /usr/ports/editors/dedit/distinfo Mon Feb 12 05:23:28 2001 +++ editors/dedit/distinfo Wed Jan 23 06:01:55 2002 @@ -1 +1 @@ -MD5 (dedit_0.6.2.1.tar.gz) = 1370a3f1beedb9cdf22608165ef4f92f +MD5 (dedit_0.6.2.3.tar.gz) = f4b52e1f7e9f905c48166794a5aada03 diff -urN /usr/ports/editors/dedit/files/patch-ae editors/dedit/files/patch-ae --- /usr/ports/editors/dedit/files/patch-ae Thu Sep 7 17:08:30 2000 +++ editors/dedit/files/patch-ae Wed Oct 31 03:46:24 2001 @@ -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 -urN /usr/ports/editors/dedit/files/patch-af editors/dedit/files/patch-af --- /usr/ports/editors/dedit/files/patch-af Thu Sep 7 17:08:30 2000 +++ editors/dedit/files/patch-af Thu Jan 1 09:00:00 1970 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201222119.g0MLJ8301430>