From b0f281dff57ae89f418ec6cd949a0fe26882e90e Mon Sep 17 00:00:00 2001 From: deischen Date: Mon, 27 Mar 2000 03:50:46 +0000 Subject: Update nedit to nedit-5.1.1. Nedit is now under the GPL, as opposed to the former, somewhat fuzzy, license from Fermilab. --- editors/nedit/Makefile | 16 ++++---- editors/nedit/distinfo | 4 +- editors/nedit/files/patch-aa | 94 +++++--------------------------------------- editors/nedit/files/patch-ab | 15 +++++++ 4 files changed, 34 insertions(+), 95 deletions(-) create mode 100644 editors/nedit/files/patch-ab (limited to 'editors/nedit') diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 18ae7683d6b7..003301f88c4e 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: nedit # Version required: 5.0.2 # Date created: 7 April 1996 -# Whom: Daniel Eischen +# Whom: Daniel Eischen # # $FreeBSD$ # -DISTNAME= nedit-5.0.2 +DISTNAME= nedit-5.1.1 CATEGORIES= editors -MASTER_SITES= ftp://ftp.nedit.org/pub/v5_0_2/ \ - ftp://ftp.nedit.org/pub/v5_0_2/contrib/ -DISTFILES= nedit_source.tar.gz nedit.app-defaults +MASTER_SITES= ftp://ftp.nedit.org/pub/v5_1_1/ \ + ftp://ftp.nedit.org/pub/contrib/misc/ +DISTFILES= nedit-5.1.1-src.tar.gz nedit-5.1.app-defaults MAINTAINER= deischen@freebsd.org @@ -18,11 +18,11 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm REQUIRES_MOTIF= yes USE_X_PREFIX= yes -NO_WRKSUBDIR= yes -EXTRACT_ONLY= nedit_source.tar.gz +EXTRACT_ONLY= nedit-5.1.1-src.tar.gz MAN1= nedit.1 nc.1 +ALL_TARGET= freebsd post-extract: - ${CP} ${DISTDIR}/nedit.app-defaults ${WRKSRC}/NEdit.ad + ${CP} ${DISTDIR}/nedit-5.1.app-defaults ${WRKSRC}/NEdit.ad .include diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo index 8fcc00d36328..ec4b9b8fa232 100644 --- a/editors/nedit/distinfo +++ b/editors/nedit/distinfo @@ -1,2 +1,2 @@ -MD5 (nedit_source.tar.gz) = f4eb558c83ecb542e07766e2775c1874 -MD5 (nedit.app-defaults) = 498caafc2c001e9bfed42b0b1811862c +MD5 (nedit-5.1.1-src.tar.gz) = dba0970c60debada237ca852b5f57ec8 +MD5 (nedit-5.1.app-defaults) = 36c5e660039e0bd4b4d05df609b505bb diff --git a/editors/nedit/files/patch-aa b/editors/nedit/files/patch-aa index e2b370615d9f..be4a7bb1c56e 100644 --- a/editors/nedit/files/patch-aa +++ b/editors/nedit/files/patch-aa @@ -1,93 +1,17 @@ -*** Makefile.orig Wed Oct 22 15:42:20 1997 ---- Makefile Sat Nov 8 23:39:51 1997 +*** Makefile.orig Wed Jan 5 23:04:45 2000 +--- Makefile Fri Mar 17 06:57:23 2000 *************** -*** 2,15 **** - # Makefile for NEdit text editor - # - # targets: sgi_nedit, hp_nedit, ultrix_nedit, ibm_nedit, sunos_nedit, -! # solaris_nedit, dec_nedit, linux_nedit - # - # Builds an intermediate library in util directory, then builds - # the nedit executable in the source directory - # +*** 22,27 **** +--- 22,33 ---- + (cd util; $(MAKE) -f Makefile.$@ libNUtil.a) + (cd source; $(MAKE) -f Makefile.$@ nedit nc) -! all: -! @echo "Please specify target" - - sgi_nedit: - (cd util; $(MAKE) -f Makefile.sgi libNUtil.a) ---- 2,15 ---- - # Makefile for NEdit text editor - # - # targets: sgi_nedit, hp_nedit, ultrix_nedit, ibm_nedit, sunos_nedit, -! # solaris_nedit, dec_nedit, linux_nedit, freebsd_nedit - # - # Builds an intermediate library in util directory, then builds - # the nedit executable in the source directory - # - -! all: freebsd_nedit -! - - sgi_nedit: - (cd util; $(MAKE) -f Makefile.sgi libNUtil.a) -*************** -*** 39,44 **** ---- 39,54 ---- - (cd util; $(MAKE) -f Makefile.dec libNUtil.a) - (cd source; $(MAKE) -f Makefile.dec nedit nc) - -+ -+ freebsd_nedit: -+ (cd util; make -f Makefile.freebsd libNUtil.a) -+ (cd source; make -f Makefile.freebsd nedit nc) -+ + install:: + (cd source; make -f Makefile.freebsd install) + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nedit.man ${PREFIX}/man/man1/nedit.1 + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 nc.man ${PREFIX}/man/man1/nc.1 + ${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit - linux_nedit: - (cd util; $(MAKE) -f Makefile.linux libNUtil.a) - (cd source; $(MAKE) -f Makefile.linux nedit nc) -*** util/Makefile.freebsd.orig Sun Apr 7 18:09:19 1996 ---- util/Makefile.freebsd Sun Apr 7 17:32:32 1996 -*************** -*** 0 **** ---- 1,8 ---- -+ CC=cc -+ AR=ar -+ -+ # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS -+ 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 + -+ include Makefile.common -*** source/Makefile.freebsd.orig Sun Apr 7 18:10:29 1996 ---- source/Makefile.freebsd Sun Apr 7 17:38:04 1996 -*************** -*** 0 **** ---- 1,8 ---- -+ CC=cc -+ AR=ar -+ -+ # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS -+ 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 -+ -+ include Makefile.common -*** source/Makefile.common.orig Sun Apr 7 17:51:54 1996 ---- source/Makefile.common Sun Apr 7 20:07:48 1996 -*************** -*** 16,21 **** ---- 16,25 ---- - nc: nc.o - $(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@ - -+ install:: nedit nc -+ ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin -+ ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin -+ - help.o: help.c - $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ - + clean: + (cd util; $(MAKE) -f Makefile.common clean) + (cd source; $(MAKE) -f Makefile.common clean) diff --git a/editors/nedit/files/patch-ab b/editors/nedit/files/patch-ab new file mode 100644 index 000000000000..a74c792799a8 --- /dev/null +++ b/editors/nedit/files/patch-ab @@ -0,0 +1,15 @@ +*** source/Makefile.common.orig Tue Dec 14 22:58:24 1999 +--- source/Makefile.common Fri Mar 17 06:55:27 2000 +*************** +*** 15,20 **** +--- 15,24 ---- + nc: nc.o + $(CC) $(CFLAGS) nc.o ../util/libNUtil.a $(LIBS) -o $@ + ++ install: nedit nc ++ ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nedit ${PREFIX}/bin ++ ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} nc ${PREFIX}/bin ++ + help.o: help.c + $(CC) $(CFLAGS) $(BIGGER_STRINGS) -c help.c -o $@ + -- cgit