diff options
author | Steve Wills <swills@FreeBSD.org> | 2019-09-28 00:29:59 +0000 |
---|---|---|
committer | Steve Wills <swills@FreeBSD.org> | 2019-09-28 00:29:59 +0000 |
commit | d51a8b260e341911bcdb5428966e36eaf2b18144 (patch) | |
tree | 6faf4706474ce87728808888e483723e957ad179 /editors/nedit | |
parent | databases/memcached: update to 1.5.18 (diff) |
editors/nedit: update to 5.7
Notes
Notes:
svn path=/head/; revision=513093
Diffstat (limited to 'editors/nedit')
-rw-r--r-- | editors/nedit/Makefile | 18 | ||||
-rw-r--r-- | editors/nedit/distinfo | 5 | ||||
-rw-r--r-- | editors/nedit/files/patch-Makefile | 14 | ||||
-rw-r--r-- | editors/nedit/files/patch-doc_nc.man | 12 | ||||
-rw-r--r-- | editors/nedit/files/patch-makefiles_Makefile.freebsd | 8 | ||||
-rw-r--r-- | editors/nedit/files/patch-source_Makefile.common | 6 | ||||
-rw-r--r-- | editors/nedit/files/patch-util-misc.c | 6 |
7 files changed, 28 insertions, 41 deletions
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 711e52d10b4d..637065fa401a 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -2,29 +2,27 @@ # $FreeBSD$ PORTNAME= nedit -PORTVERSION= 5.6 -PORTREVISION= 1 +PORTVERSION= 5.7 CATEGORIES= editors -MASTER_SITES= http://people.freebsd.org/~deischen/distfiles/ \ - SF/${PORTNAME}/${PORTNAME}-source \ - ftp://ftp.nluug.nl/pub/editors/NEdit/contrib/misc/ -DISTFILES= nedit-5.6a-src.tar.gz nedit.app-defaults -EXTRACT_ONLY= nedit-5.6a-src.tar.gz +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source +DISTFILES= nedit-${PORTVERSION}-src.tar.gz \ + nedit.app-defaults +EXTRACT_ONLY= nedit-${PORTVERSION}-src.tar.gz MAINTAINER= swills@FreeBSD.org COMMENT= X11/Motif GUI text editor for programs and plain text files LICENSE= GPLv1 -USES= motif perl5 +USES= motif perl5 xorg USE_PERL5= build ALL_TARGET= freebsd PLIST_FILES= bin/nclient \ bin/nedit \ + lib/X11/app-defaults/NEdit.ad \ man/man1/nclient.1.gz \ - man/man1/nedit.1.gz \ - lib/X11/app-defaults/NEdit.ad + man/man1/nedit.1.gz post-extract: ${CP} ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo index 9c0fa00921c5..8ef5536de219 100644 --- a/editors/nedit/distinfo +++ b/editors/nedit/distinfo @@ -1,4 +1,5 @@ -SHA256 (nedit-5.6a-src.tar.gz) = 53677983cb6c91c5da1fcdcac90f7f9a193f08fa13b7a6330bc9ce21f9461eed -SIZE (nedit-5.6a-src.tar.gz) = 1353454 +TIMESTAMP = 1569629725 +SHA256 (nedit-5.7-src.tar.gz) = add9ac79ff973528ad36c86858238bac4f59896c27dbf285cbe6a4d425fca17a +SIZE (nedit-5.7-src.tar.gz) = 1344754 SHA256 (nedit.app-defaults) = f7dd96054854d2831d77820c2640207ac1fb41f97a442a160a4d576b6499b600 SIZE (nedit.app-defaults) = 7634 diff --git a/editors/nedit/files/patch-Makefile b/editors/nedit/files/patch-Makefile index bdc56b3e719b..caf371dab3b4 100644 --- a/editors/nedit/files/patch-Makefile +++ b/editors/nedit/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2014-12-07 00:03:44.000000000 -0500 -+++ Makefile 2015-03-30 08:28:03.000000000 -0400 -@@ -17,6 +17,7 @@ +--- Makefile.orig 2017-02-04 18:14:54 UTC ++++ Makefile +@@ -16,6 +16,7 @@ all: @echo "Please specify target:" @echo "(For example, type \"make linux\" for a Linux system.)" @(cd makefiles && ls -C Makefile* | sed -e 's/Makefile.//g') @@ -8,16 +8,16 @@ .DEFAULT: @- (cd Microline/XmL; if [ -f ../../makefiles/Makefile.$@ -a ! -f ./Makefile.$@ ];\ -@@ -44,6 +45,12 @@ +@@ -42,6 +43,12 @@ docs: + # We need a "dev-all" target that builds the docs plus binaries, but # that doesn't work since we require the user to specify the target. More # thought is needed - ++ +install:: + (cd source; make -f Makefile.freebsd install) + ${INSTALL} ${COPY} -m 644 doc/nedit.man $(DESTDIR)${PREFIX}/man/man1/nedit.1 + ${INSTALL} ${COPY} -m 644 doc/nc.man $(DESTDIR)${PREFIX}/man/man1/nclient.1 + ${INSTALL} ${COPY} -m 644 NEdit.ad $(DESTDIR)${LOCALBASE}/lib/X11/app-defaults/NEdit.ad -+ + clean: (cd util; $(MAKE) -f Makefile.common clean) - (cd Xlt; $(MAKE) -f Makefile.common clean) diff --git a/editors/nedit/files/patch-doc_nc.man b/editors/nedit/files/patch-doc_nc.man deleted file mode 100644 index 12cdc67f5583..000000000000 --- a/editors/nedit/files/patch-doc_nc.man +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/nc.man.orig Thu Nov 20 18:40:13 2003 -+++ doc/nc.man Sat Feb 7 14:54:18 2004 -@@ -285,6 +285,9 @@ - .PP - For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit - distribution kit. -+.PP -+In FreeBSD, \fInc\fR is installed as \fInclient\fR so it does not -+conflict with the \fInetcat\fR port which also installs an \fInc\fR. - .SH "SEE ALSO" - .IX Header "SEE ALSO" - \&\fInedit\fR\|(1), X(1), \fImwm\fR\|(1), \fIctags\fR\|(1), \fIetags\fR\|(1) diff --git a/editors/nedit/files/patch-makefiles_Makefile.freebsd b/editors/nedit/files/patch-makefiles_Makefile.freebsd index ee6893bd2899..808327ad4ab7 100644 --- a/editors/nedit/files/patch-makefiles_Makefile.freebsd +++ b/editors/nedit/files/patch-makefiles_Makefile.freebsd @@ -1,7 +1,7 @@ ---- makefiles/Makefile.freebsd.orig Sun Sep 28 15:03:10 2003 -+++ makefiles/Makefile.freebsd Sat Feb 7 15:00:18 2004 +--- makefiles/Makefile.freebsd.orig 2017-02-04 17:45:50 UTC ++++ makefiles/Makefile.freebsd @@ -1,6 +1,6 @@ - # $Id: Makefile.freebsd,v 1.5.2.1 2003/09/28 15:03:10 edg Exp $ + # $Id: Makefile.freebsd,v 1.6 2003/11/22 13:03:39 edg Exp $ -CC=cc -AR=ar +CC?=cc @@ -9,7 +9,7 @@ # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS # -@@ -10,8 +10,8 @@ +@@ -10,8 +10,8 @@ AR=ar # To test if the Motif library exports the runtime version # add -DHAVE__XMVERSIONSTRING to CFLAGS # diff --git a/editors/nedit/files/patch-source_Makefile.common b/editors/nedit/files/patch-source_Makefile.common index f10542e16308..616611da2dff 100644 --- a/editors/nedit/files/patch-source_Makefile.common +++ b/editors/nedit/files/patch-source_Makefile.common @@ -1,6 +1,6 @@ ---- source/Makefile.common.orig 2004-03-21 22:25:56.000000000 +0800 -+++ source/Makefile.common 2014-06-15 11:03:55.335101520 +0800 -@@ -28,6 +28,10 @@ nedit: $(OBJS) ../util/libNUtil.a $(XMLL +--- source/Makefile.common.orig 2017-02-04 16:15:41 UTC ++++ source/Makefile.common +@@ -27,6 +27,10 @@ nedit: $(OBJS) ../util/libNUtil.a $(XMLLIB) $(XLTLIB) nc: nc.o server_common.o ../util/libNUtil.a $(CC) $(CFLAGS) nc.o server_common.o ../util/libNUtil.a $(LIBS) -o $@ diff --git a/editors/nedit/files/patch-util-misc.c b/editors/nedit/files/patch-util-misc.c index 29640e2fefe2..87c06552f367 100644 --- a/editors/nedit/files/patch-util-misc.c +++ b/editors/nedit/files/patch-util-misc.c @@ -1,6 +1,6 @@ ---- util/misc.c.orig 2004-08-09 18:20:00.000000000 -0400 -+++ util/misc.c 2012-02-03 02:54:30.000000000 -0500 -@@ -383,7 +383,10 @@ +--- util/misc.c.orig 2017-02-04 16:15:41 UTC ++++ util/misc.c +@@ -400,7 +400,10 @@ Boolean FindBestVisual(Display *display, const char *a *colormap = cachedColormap; return (*visual == DefaultVisual(display, screen)); } |