summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/nedit/Makefile14
-rw-r--r--editors/nedit/distinfo8
-rw-r--r--editors/nedit/patches/patch-aa17
-rw-r--r--editors/nedit/pkg/PLIST5
4 files changed, 24 insertions, 20 deletions
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 5efb6c5d335..43fc34f52a4 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2001/10/24 22:10:53 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/31 00:03:16 mjl Exp $
-DISTNAME= nedit-5.1.1-src
-PKGNAME= nedit-5.1.1
+VERS= 5.2
+DISTNAME= nedit-${VERS}-src
+PKGNAME= nedit-${VERS}
CATEGORIES= editors
-MASTER_SITES= http://ftp.nedit.org/ftp/v5_1_1/
+MASTER_SITES= http://ftp.nedit.org/ftp/v${VERS:S/./_/g}/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.nedit.org/
@@ -17,10 +18,13 @@ WRKSRC= ${WRKDIR}/${PKGNAME}
do-install:
.for PROGRAM in nc nedit
${INSTALL_PROGRAM} ${WRKSRC}/source/${PROGRAM} ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/${PROGRAM}.man ${PREFIX}/man/man1/${PROGRAM}.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/${PROGRAM}.man ${PREFIX}/man/man1/${PROGRAM}.1
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nedit
+ ${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/nedit
+ ${INSTALL_DATA} ${WRKSRC}/doc/faq.txt ${PREFIX}/share/doc/nedit
+ ${INSTALL_DATA} ${WRKSRC}/doc/NEdit.ad ${PREFIX}/lib/X11/app-defaults/NEdit
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/motif.buildlink.mk"
diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo
index da0a04936a7..30b8f88f235 100644
--- a/editors/nedit/distinfo
+++ b/editors/nedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/07/02 21:54:19 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/10/31 00:03:16 mjl Exp $
-SHA1 (nedit-5.1.1-src.tar.gz) = 29332e39f0d5b3beb62323ea54218571c3b75960
-Size (nedit-5.1.1-src.tar.gz) = 617036 bytes
-SHA1 (patch-aa) = 435eee2192f7e9f40306b21ce298d04dfc8cfb7b
+SHA1 (nedit-5.2-src.tar.gz) = 00327cb34f02318eb786d44051478dc367f65563
+Size (nedit-5.2-src.tar.gz) = 768534 bytes
+SHA1 (patch-aa) = 3e84aa03d60cf52a98a2c12053c045e8bc0cddeb
SHA1 (patch-ab) = 1d566822879aa6519bea91acb03cdba139edd250
diff --git a/editors/nedit/patches/patch-aa b/editors/nedit/patches/patch-aa
index 1847c0ac981..0eb6632e4ed 100644
--- a/editors/nedit/patches/patch-aa
+++ b/editors/nedit/patches/patch-aa
@@ -1,15 +1,12 @@
-$NetBSD: patch-aa,v 1.8 2001/07/02 21:54:22 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2001/10/31 00:03:16 mjl Exp $
---- makefiles/Makefile.netbsd.orig Fri Dec 10 18:07:06 1999
-+++ makefiles/Makefile.netbsd
-@@ -2,8 +2,8 @@
- AR=ar
-
- # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
--CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-+CFLAGS+=-DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+--- makefiles/Makefile.netbsd.orig Sat Aug 18 01:02:55 2001
++++ makefiles/Makefile.netbsd Wed Oct 31 00:18:05 2001
+@@ -9,6 +9,6 @@
+ #
+ CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
ARFLAGS=-ur
-LIBS= -L/usr/X11R6/lib -lm -lXm -lXpm -lXext -lXt -lSM -lICE -lX11
-+LIBS= ${LDFLAGS} ${MOTIFLIB} -lm -lXpm -lXext -lXt -lSM -lICE -lX11
++LIBS= ${LDFLAGS} ${MOTIFLIB} -L/usr/X11R6/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
include Makefile.common
diff --git a/editors/nedit/pkg/PLIST b/editors/nedit/pkg/PLIST
index 42ac4c5fefe..69044fc183d 100644
--- a/editors/nedit/pkg/PLIST
+++ b/editors/nedit/pkg/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/02 22:33:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/31 00:03:16 mjl Exp $
bin/nc
bin/nedit
+lib/X11/app-defaults/NEdit
man/man1/nc.1
man/man1/nedit.1
share/doc/nedit/README
+share/doc/nedit//ReleaseNotes
+share/doc/nedit/faq.txt
@dirrm share/doc/nedit