Update to version 1.8. This version adds folding for C++ programs.

While here, add user-destdir support.

4 files changed, 47 insertions, 17 deletions

diff --git a/editors/fe/Makefile b/editors/fe/Makefile
index d766b8b6400..ed7855b42ca 100644
--- a/editors/fe/Makefile
+++ b/editors/fe/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2007/11/20 11:08:50 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/01/12 04:17:38 bjs Exp $
 
-DISTNAME=	fe-1.6
-PKGREVISION=	1
+DISTNAME=	fe-1.8
 CATEGORIES=	editors
 MASTER_SITES=	http://www.moria.de/~michael/fe/
 
@@ -9,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.moria.de/~michael/fe/
 COMMENT=	Folding editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	msgfmt
 BROKEN_GETTEXT_DETECTION=	yes
@@ -16,8 +17,8 @@ BROKEN_GETTEXT_DETECTION=	yes
 INSTALLATION_DIRS=	share/doc/fe
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/fe.ps ${PREFIX}/share/doc/fe/fe.ps
-	${INSTALL_DATA} ${WRKSRC}/feref.ps ${PREFIX}/share/doc/fe/feref.ps
+	${INSTALL_DATA} ${WRKSRC}/fe.ps ${DESTDIR}${PREFIX}/share/doc/fe/fe.ps
+	${INSTALL_DATA} ${WRKSRC}/feref.ps ${DESTDIR}${PREFIX}/share/doc/fe/feref.ps
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/editors/fe/distinfo b/editors/fe/distinfo
index 0b6dbad9a28..f7d6069e450 100644
--- a/editors/fe/distinfo
+++ b/editors/fe/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/01/30 23:52:53 wiz Exp $
+$NetBSD: distinfo,v 1.3 2008/01/12 04:17:38 bjs Exp $
 
-SHA1 (fe-1.6.tar.gz) = 6c7a43c0f28256f8831792b7fa79914ace389782
-RMD160 (fe-1.6.tar.gz) = d213bde0860e8f849cb8e678d624f3a7f0b75562
-Size (fe-1.6.tar.gz) = 160770 bytes
-SHA1 (patch-aa) = a072f1d9033dbcd52bcbb7c87d556d4b12568ffc
+SHA1 (fe-1.8.tar.gz) = b956e5e4c9c9bc925903d0c0b6de0b7b829fcce6
+RMD160 (fe-1.8.tar.gz) = a3d186dbc042fe74fbfdc8e83d6237a50fea692d
+Size (fe-1.8.tar.gz) = 169151 bytes
+SHA1 (patch-aa) = 3686219a0f3fac572772344718384cf06cf5baba
+SHA1 (patch-ab) = 4b72dbe1eabfdb7f65c20f9d2db03950c636f97c
diff --git a/editors/fe/patches/patch-aa b/editors/fe/patches/patch-aa
index 7efee9d218c..1245d668460 100644
--- a/editors/fe/patches/patch-aa
+++ b/editors/fe/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2007/01/30 23:52:53 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2008/01/12 04:17:38 bjs Exp $
 
---- configure.orig	2007-01-30 23:50:13.000000000 +0000
+--- configure.orig	2007-09-12 09:58:44.000000000 -0400
 +++ configure
-@@ -2717,6 +2717,7 @@ fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+@@ -3170,6 +3170,7 @@ fi
+ 
+ 
  LIBS=$ORIG_LIBS
 +curses_ok=yes
  if test "$curses_ok" = yes; then
-   echo "$as_me:$LINENO: checking for modern curses without raw() bug" >&5
- echo $ECHO_N "checking for modern curses without raw() bug... $ECHO_C" >&6
+   { echo "$as_me:$LINENO: checking for modern curses without raw() bug" >&5
+ echo $ECHO_N "checking for modern curses without raw() bug... $ECHO_C" >&6; }
diff --git a/editors/fe/patches/patch-ab b/editors/fe/patches/patch-ab
new file mode 100644
index 00000000000..f53f6aff283
--- /dev/null
+++ b/editors/fe/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2008/01/12 04:17:38 bjs Exp $
+
+--- Makefile.in.orig	2007-08-31 14:47:09.000000000 -0400
++++ Makefile.in
+@@ -33,16 +33,16 @@ install-po:	install-po-@USE_NLS@
+ install-po-no:
+ install-po-yes:	$(CATALOGS)
+ 		for cat in $(CATALOGS); do \
+-		  dir=$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \
+-		  [ -d $$dir ] || @INSTALL@ -m 755 -d $$dir; \
+-		  @INSTALL@ -m 644 $$cat $$dir/fe.mo; \
++		  dir=$(DESTDIR)$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \
++		  [ -d $$dir ] || $(BSD_INSTALL_DATA_DIR) -m 755 -d $$dir; \
++		  $(BSD_INSTALL_DATA) -m 644 $$cat $$dir/fe.mo; \
+ 		done
+ 
+ install:	all
+-		$(INSTALL) -m 755 -d $(BINDIR)
+-		$(INSTALL_PROGRAM) -s fe $(BINDIR)/fe
+-		$(INSTALL) -m 755 -d $(MANDIR)/man1
+-		$(INSTALL_DATA) fe.1 $(MANDIR)/man1/fe.1
++		$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
++		$(BSD_INSTALL_PROGRAM) fe $(DESTDIR)$(BINDIR)/fe
++		$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
++		$(BSD_INSTALL_MAN) fe.1 $(DESTDIR)$(MANDIR)/man1/fe.1
+ 		make install-po
+ 
+ .c.o: