Sat Jan 12 04:17:38 2008 UTC ()
Update to version 1.8.  This version adds folding for C++ programs.
While here, add user-destdir support.


(bjs)
diff -r1.11 -r1.12 pkgsrc/editors/fe/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/fe/distinfo
diff -r1.1 -r1.2 pkgsrc/editors/fe/patches/patch-aa
diff -r0 -r1.1 pkgsrc/editors/fe/patches/patch-ab
cvs diff -r1.11 -r1.12 pkgsrc/editors/fe/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/fe/Makefile 2007/11/20 11:08:50 1.11
+++ pkgsrc/editors/fe/Makefile 2008/01/12 04:17:38 1.12
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.11 2007/11/20 11:08:50 rillig Exp $ 1# $NetBSD: Makefile,v 1.12 2008/01/12 04:17:38 bjs Exp $
2 2
3DISTNAME= fe-1.6 3DISTNAME= fe-1.8
4PKGREVISION= 1 
5CATEGORIES= editors 4CATEGORIES= editors
6MASTER_SITES= http://www.moria.de/~michael/fe/ 5MASTER_SITES= http://www.moria.de/~michael/fe/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.moria.de/~michael/fe/ 8HOMEPAGE= http://www.moria.de/~michael/fe/
10COMMENT= Folding editor 9COMMENT= Folding editor
11 10
 11PKG_DESTDIR_SUPPORT= user-destdir
 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13USE_TOOLS+= msgfmt 14USE_TOOLS+= msgfmt
14BROKEN_GETTEXT_DETECTION= yes 15BROKEN_GETTEXT_DETECTION= yes
15 16
16INSTALLATION_DIRS= share/doc/fe 17INSTALLATION_DIRS= share/doc/fe
17 18
18post-install: 19post-install:
19 ${INSTALL_DATA} ${WRKSRC}/fe.ps ${PREFIX}/share/doc/fe/fe.ps 20 ${INSTALL_DATA} ${WRKSRC}/fe.ps ${DESTDIR}${PREFIX}/share/doc/fe/fe.ps
20 ${INSTALL_DATA} ${WRKSRC}/feref.ps ${PREFIX}/share/doc/fe/feref.ps 21 ${INSTALL_DATA} ${WRKSRC}/feref.ps ${DESTDIR}${PREFIX}/share/doc/fe/feref.ps
21 22
22.include "../../devel/gettext-lib/buildlink3.mk" 23.include "../../devel/gettext-lib/buildlink3.mk"
23.include "../../mk/curses.buildlink3.mk" 24.include "../../mk/curses.buildlink3.mk"
24 25
25.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/editors/fe/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/fe/distinfo 2007/01/30 23:52:53 1.2
+++ pkgsrc/editors/fe/distinfo 2008/01/12 04:17:38 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2007/01/30 23:52:53 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2008/01/12 04:17:38 bjs Exp $
2 2
3SHA1 (fe-1.6.tar.gz) = 6c7a43c0f28256f8831792b7fa79914ace389782 3SHA1 (fe-1.8.tar.gz) = b956e5e4c9c9bc925903d0c0b6de0b7b829fcce6
4RMD160 (fe-1.6.tar.gz) = d213bde0860e8f849cb8e678d624f3a7f0b75562 4RMD160 (fe-1.8.tar.gz) = a3d186dbc042fe74fbfdc8e83d6237a50fea692d
5Size (fe-1.6.tar.gz) = 160770 bytes 5Size (fe-1.8.tar.gz) = 169151 bytes
6SHA1 (patch-aa) = a072f1d9033dbcd52bcbb7c87d556d4b12568ffc 6SHA1 (patch-aa) = 3686219a0f3fac572772344718384cf06cf5baba
 7SHA1 (patch-ab) = 4b72dbe1eabfdb7f65c20f9d2db03950c636f97c
cvs diff -r1.1 -r1.2 pkgsrc/editors/fe/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/editors/fe/patches/patch-aa 2007/01/30 23:52:53 1.1
+++ pkgsrc/editors/fe/patches/patch-aa 2008/01/12 04:17:38 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-aa,v 1.1 2007/01/30 23:52:53 wiz Exp $ 1$NetBSD: patch-aa,v 1.2 2008/01/12 04:17:38 bjs Exp $
2 2
3--- configure.orig 2007-01-30 23:50:13.000000000 +0000 3--- configure.orig 2007-09-12 09:58:44.000000000 -0400
4+++ configure 4+++ configure
5@@ -2717,6 +2717,7 @@ fi 5@@ -3170,6 +3170,7 @@ fi
6 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 6
7 fi 7
8 LIBS=$ORIG_LIBS 8 LIBS=$ORIG_LIBS
9+curses_ok=yes 9+curses_ok=yes
10 if test "$curses_ok" = yes; then 10 if test "$curses_ok" = yes; then
11 echo "$as_me:$LINENO: checking for modern curses without raw() bug" >&5 11 { echo "$as_me:$LINENO: checking for modern curses without raw() bug" >&5
12 echo $ECHO_N "checking for modern curses without raw() bug... $ECHO_C" >&6 12 echo $ECHO_N "checking for modern curses without raw() bug... $ECHO_C" >&6; }
File Added: pkgsrc/editors/fe/patches/patch-ab
$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: