- Add staging support

- Switch to PLIST_FILES
- Rename patches to canonical names

5 files changed, 28 insertions, 43 deletions

diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index a6d827b0e403..76a71e5a4a59 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -16,8 +16,7 @@ USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAKE_ARGS=	MAKE="${MAKE_CMD}"
 
-MAN1=		xless.1
-MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xless lib/X11/xless.help lib/X11/app-defaults/XLess \
+		lib/X11/app-defaults/XLess-color man/man1/xless.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/misc/xless/files/patch-aa b/misc/xless/files/patch-Imakefile
index 6327fc161636..5a9cf905b08e 100644
--- a/misc/xless/files/patch-aa
+++ b/misc/xless/files/patch-Imakefile
@@ -1,5 +1,5 @@
---- Imakefile.orig	Thu Jun  2 16:22:14 1994
-+++ Imakefile	Fri Dec 27 18:52:23 1996
+--- ./Imakefile.orig	1994-06-03 01:22:14.000000000 +0200
++++ ./Imakefile	2014-06-13 14:51:12.981736817 +0200
 @@ -5,7 +5,8 @@
   *	-DPRINTCMD=\"/usr/ucb/lpr\"	- path to send file to printer
   *	-DTILDE_EXPANSION		- perform ~ expansion on filenames
@@ -10,7 +10,7 @@
  
  
             SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \
-@@ -24,7 +25,7 @@ LOCAL_LIBRARIES = -Lregexp -lregexp XawC
+@@ -24,10 +25,10 @@
  #define PassCDebugFlags
  #endif
  
@@ -18,4 +18,8 @@
 +NamedMakeSubdirs(./regexp/libregexp.a,$(SUBDIRS))
  ComplexProgramTarget(xless)
  
- InstallNonExec(xless.help, $(LIBDIR))
+-InstallNonExec(xless.help, $(LIBDIR))
++InstallNonExec(xless.help,$(LIBDIR))
+ InstallAppDefaults(XLess)
+ 
+ #if ProjectX >= 5
diff --git a/misc/xless/files/patch-ab b/misc/xless/files/patch-ab
deleted file mode 100644
index b41554543c29..000000000000
--- a/misc/xless/files/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-*** ../work/xless-1.7/xless.h	Mon Dec 23 15:57:37 1996
---- xless.h	Mon Dec 23 16:11:53 1996
-***************
-*** 38,50 ****
-  
-  #define XLESS_MAX_INPUT		256
-  
-! /* handle differences between K&R and ANSI C */
-  #if __STDC__
-  #define __P(a)	a
-  #else
-  #define __P(a)	()
-  #define const
-  #endif
-  
-  /*
-   * The default editor; make sure the file exists.
---- 38,51 ----
-  
-  #define XLESS_MAX_INPUT		256
-  
-! /* handle differences between K&R and ANSI C
-  #if __STDC__
-  #define __P(a)	a
-  #else
-  #define __P(a)	()
-  #define const
-  #endif
-+ */
-  
-  /*
-   * The default editor; make sure the file exists.
diff --git a/misc/xless/files/patch-xless.h b/misc/xless/files/patch-xless.h
new file mode 100644
index 000000000000..6c2e5e688e2f
--- /dev/null
+++ b/misc/xless/files/patch-xless.h
@@ -0,0 +1,18 @@
+--- ./xless.h.orig	1994-07-29 04:56:41.000000000 +0200
++++ ./xless.h	2014-06-13 14:48:54.067816752 +0200
+@@ -38,13 +38,14 @@
+ 
+ #define XLESS_MAX_INPUT		256
+ 
+-/* handle differences between K&R and ANSI C */
++/* handle differences between K&R and ANSI C
+ #if __STDC__
+ #define __P(a)	a
+ #else
+ #define __P(a)	()
+ #define const
+ #endif
++*/
+ 
+ /*
+  * The default editor; make sure the file exists.
diff --git a/misc/xless/pkg-plist b/misc/xless/pkg-plist
deleted file mode 100644
index 5c9d57f0975a..000000000000
--- a/misc/xless/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/xless
-lib/X11/xless.help
-lib/X11/app-defaults/XLess
-lib/X11/app-defaults/XLess-color