Index: head/editors/nedit/Makefile =================================================================== --- head/editors/nedit/Makefile (revision 513092) +++ head/editors/nedit/Makefile (revision 513093) @@ -1,40 +1,38 @@ # Created by: Daniel Eischen # $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 post-build: cd ${WRKSRC} && make docs post-install:: .for file in nedit nclient @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor .include Index: head/editors/nedit/distinfo =================================================================== --- head/editors/nedit/distinfo (revision 513092) +++ head/editors/nedit/distinfo (revision 513093) @@ -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 Index: head/editors/nedit/files/patch-doc_nc.man =================================================================== --- head/editors/nedit/files/patch-doc_nc.man (revision 513092) +++ head/editors/nedit/files/patch-doc_nc.man (nonexistent) @@ -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) Property changes on: head/editors/nedit/files/patch-doc_nc.man ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/nedit/files/patch-Makefile =================================================================== --- head/editors/nedit/files/patch-Makefile (revision 513092) +++ head/editors/nedit/files/patch-Makefile (revision 513093) @@ -1,23 +1,23 @@ ---- 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') + @(cd doc; $(MAKE) man) .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) Index: head/editors/nedit/files/patch-makefiles_Makefile.freebsd =================================================================== --- head/editors/nedit/files/patch-makefiles_Makefile.freebsd (revision 513092) +++ head/editors/nedit/files/patch-makefiles_Makefile.freebsd (revision 513093) @@ -1,22 +1,22 @@ ---- 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 +AR?=ar # 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 # -CFLAGS=-O -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM -LIBS= ${MOTIFLIB} -L${PREFIX}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 +CFLAGS+=-O -I${LOCALBASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM -DBUILD_UNTESTED_NEDIT +LIBS+= ${MOTIFLIB} -L${LOCALBASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11 include Makefile.common Index: head/editors/nedit/files/patch-source_Makefile.common =================================================================== --- head/editors/nedit/files/patch-source_Makefile.common (revision 513092) +++ head/editors/nedit/files/patch-source_Makefile.common (revision 513093) @@ -1,13 +1,13 @@ ---- 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 $@ +install: nedit nc + ${INSTALL} ${COPY} ${STRIP} nedit $(DESTDIR)${PREFIX}/bin + ${INSTALL} ${COPY} ${STRIP} nc $(DESTDIR)${PREFIX}/bin/nclient + help.o: help.c $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ Index: head/editors/nedit/files/patch-util-misc.c =================================================================== --- head/editors/nedit/files/patch-util-misc.c (revision 513092) +++ head/editors/nedit/files/patch-util-misc.c (revision 513093) @@ -1,14 +1,14 @@ ---- 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)); } - + + /* Set "Default" visual to avoid crashes with the detected best ones. */ + reqID = DefaultVisual(display, screen)->visualid; + /* Read the visualID and installColormap resources for the application. visualID can be specified either as a number (the visual id as shown by xdpyinfo), as a visual class name, or as Best or Default. */