From fc3a5e4e04f3b53d69dfec65711df6a703aa7a10 Mon Sep 17 00:00:00 2001 From: adamw Date: Mon, 28 Jul 2014 18:13:49 +0000 Subject: Rename editors/ patch-xy patches to reflect the files they modify. --- editors/nedit/files/patch-Makefile | 15 +++++++++++++++ editors/nedit/files/patch-aa | 15 --------------- editors/nedit/files/patch-ab | 13 ------------- editors/nedit/files/patch-ac | 22 ---------------------- editors/nedit/files/patch-ad | 12 ------------ editors/nedit/files/patch-doc_nc.man | 12 ++++++++++++ .../nedit/files/patch-makefiles_Makefile.freebsd | 22 ++++++++++++++++++++++ editors/nedit/files/patch-source_Makefile.common | 13 +++++++++++++ 8 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 editors/nedit/files/patch-Makefile delete mode 100644 editors/nedit/files/patch-aa delete mode 100644 editors/nedit/files/patch-ab delete mode 100644 editors/nedit/files/patch-ac delete mode 100644 editors/nedit/files/patch-ad create mode 100644 editors/nedit/files/patch-doc_nc.man create mode 100644 editors/nedit/files/patch-makefiles_Makefile.freebsd create mode 100644 editors/nedit/files/patch-source_Makefile.common (limited to 'editors/nedit') diff --git a/editors/nedit/files/patch-Makefile b/editors/nedit/files/patch-Makefile new file mode 100644 index 000000000000..f2e9fc0158cb --- /dev/null +++ b/editors/nedit/files/patch-Makefile @@ -0,0 +1,15 @@ +--- Makefile.orig 2004-10-01 04:51:05.000000000 +0800 ++++ Makefile 2014-06-15 11:03:09.564113068 +0800 +@@ -44,6 +44,12 @@ docs: + # 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-aa b/editors/nedit/files/patch-aa deleted file mode 100644 index f2e9fc0158cb..000000000000 --- a/editors/nedit/files/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.orig 2004-10-01 04:51:05.000000000 +0800 -+++ Makefile 2014-06-15 11:03:09.564113068 +0800 -@@ -44,6 +44,12 @@ docs: - # 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-ab b/editors/nedit/files/patch-ab deleted file mode 100644 index f10542e16308..000000000000 --- a/editors/nedit/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 - 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 $@ - diff --git a/editors/nedit/files/patch-ac b/editors/nedit/files/patch-ac deleted file mode 100644 index ee6893bd2899..000000000000 --- a/editors/nedit/files/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ ---- makefiles/Makefile.freebsd.orig Sun Sep 28 15:03:10 2003 -+++ makefiles/Makefile.freebsd Sat Feb 7 15:00:18 2004 -@@ -1,6 +1,6 @@ - # $Id: Makefile.freebsd,v 1.5.2.1 2003/09/28 15:03:10 edg Exp $ --CC=cc --AR=ar -+CC?=cc -+AR?=ar - - # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS - # -@@ -10,8 +10,8 @@ - # 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 - diff --git a/editors/nedit/files/patch-ad b/editors/nedit/files/patch-ad deleted file mode 100644 index 12cdc67f5583..000000000000 --- a/editors/nedit/files/patch-ad +++ /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-doc_nc.man b/editors/nedit/files/patch-doc_nc.man new file mode 100644 index 000000000000..12cdc67f5583 --- /dev/null +++ b/editors/nedit/files/patch-doc_nc.man @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..ee6893bd2899 --- /dev/null +++ b/editors/nedit/files/patch-makefiles_Makefile.freebsd @@ -0,0 +1,22 @@ +--- makefiles/Makefile.freebsd.orig Sun Sep 28 15:03:10 2003 ++++ makefiles/Makefile.freebsd Sat Feb 7 15:00:18 2004 +@@ -1,6 +1,6 @@ + # $Id: Makefile.freebsd,v 1.5.2.1 2003/09/28 15:03:10 edg Exp $ +-CC=cc +-AR=ar ++CC?=cc ++AR?=ar + + # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS + # +@@ -10,8 +10,8 @@ + # 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 + diff --git a/editors/nedit/files/patch-source_Makefile.common b/editors/nedit/files/patch-source_Makefile.common new file mode 100644 index 000000000000..f10542e16308 --- /dev/null +++ b/editors/nedit/files/patch-source_Makefile.common @@ -0,0 +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 + 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 $@ + -- cgit