- Support staging

- Use meaningful patch names
- Convert USE_GMAKE to USES

10 files changed, 33 insertions, 4 deletions

diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 4e2f0fd78b66..fa7aede567dc 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -12,10 +12,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A replacement for xbiff that handles multiple mail files
 
 USE_XORG=	xext xt xaw
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
-MAN1=		xbuffy.1
-PLIST_FILES=	bin/xbuffy lib/X11/app-defaults/XBuffy
+PLIST_FILES=	bin/xbuffy lib/X11/app-defaults/XBuffy man/man1/xbuffy.1.gz
+
+post-build:
+	${STRIP_CMD} ${WRKSRC}/${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/xbuffy/files/patch-Makefile.in b/mail/xbuffy/files/patch-Makefile.in
new file mode 100644
index 000000000000..2a1921fae5e6
--- /dev/null
+++ b/mail/xbuffy/files/patch-Makefile.in
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	1998-07-01 14:15:32.000000000 +0400
++++ Makefile.in	2014-05-10 03:42:48.000000000 +0400
+@@ -41,17 +41,16 @@
+ 	(cd libdyn && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -I..")
+ 
+ install: xbuffy @LED@
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	-mv -f $(bindir)/xbuffy $(bindir)/xbuffy.old
+-	$(INSTALL) -m 755 xbuffy $(bindir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -m 755 xbuffy $(DESTDIR)$(bindir)
+ 	-if [ "@LED@" ]; then  \
+-		$(INSTALL) -m 4755 led $(bindir); \
++		$(INSTALL) -m 4755 led $(DESTDIR)$(bindir); \
+ 	fi
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(INSTALL) -m 644 $(srcdir)/xbuffy.man $(mandir)/man1/xbuffy.1
+-	-if [ ! -f $(libdir)/X11/app-defaults/XBuffy ]; then \
+-		$(srcdir)/mkinstalldirs $(libdir)/X11/app-defaults; \
+-		$(INSTALL) -m 644 $(srcdir)/XBuffy.ad $(libdir)/X11/app-defaults/XBuffy; \
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -m 644 $(srcdir)/xbuffy.man $(DESTDIR)$(mandir)/man1/xbuffy.1
++	-if [ ! -f $(DESTDIR)$(libdir)/X11/app-defaults/XBuffy ]; then \
++		$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/X11/app-defaults; \
++		$(INSTALL) -m 644 $(srcdir)/XBuffy.ad $(DESTDIR)$(libdir)/X11/app-defaults/XBuffy; \
+ 	fi
+ 
+ uninstall:
diff --git a/mail/xbuffy/files/patch-aa b/mail/xbuffy/files/patch-libdyn__dyn_append.c
index 75665ec74149..75665ec74149 100644
--- a/mail/xbuffy/files/patch-aa
+++ b/mail/xbuffy/files/patch-libdyn__dyn_append.c
diff --git a/mail/xbuffy/files/patch-ab b/mail/xbuffy/files/patch-libdyn__dyn_create.c
index 33dd3d5344c6..33dd3d5344c6 100644
--- a/mail/xbuffy/files/patch-ab
+++ b/mail/xbuffy/files/patch-libdyn__dyn_create.c
diff --git a/mail/xbuffy/files/patch-ac b/mail/xbuffy/files/patch-libdyn__dyn_delete.c
index 3bdaaf9a2083..3bdaaf9a2083 100644
--- a/mail/xbuffy/files/patch-ac
+++ b/mail/xbuffy/files/patch-libdyn__dyn_delete.c
diff --git a/mail/xbuffy/files/patch-ad b/mail/xbuffy/files/patch-libdyn__dyn_insert.c
index 893ecc332448..893ecc332448 100644
--- a/mail/xbuffy/files/patch-ad
+++ b/mail/xbuffy/files/patch-libdyn__dyn_insert.c
diff --git a/mail/xbuffy/files/patch-ae b/mail/xbuffy/files/patch-libdyn__dyn_put.c
index 26b0a16ae07e..26b0a16ae07e 100644
--- a/mail/xbuffy/files/patch-ae
+++ b/mail/xbuffy/files/patch-libdyn__dyn_put.c
diff --git a/mail/xbuffy/files/patch-af b/mail/xbuffy/files/patch-libdyn__dyn_realloc.c
index 585f84a6cb13..585f84a6cb13 100644
--- a/mail/xbuffy/files/patch-af
+++ b/mail/xbuffy/files/patch-libdyn__dyn_realloc.c
diff --git a/mail/xbuffy/files/patch-ag b/mail/xbuffy/files/patch-nntp.c
index fc177e5ede21..fc177e5ede21 100644
--- a/mail/xbuffy/files/patch-ag
+++ b/mail/xbuffy/files/patch-nntp.c
diff --git a/mail/xbuffy/files/patch-ah b/mail/xbuffy/files/patch-xbuffy.c
index c1d7b699a87a..c1d7b699a87a 100644
--- a/mail/xbuffy/files/patch-ah
+++ b/mail/xbuffy/files/patch-xbuffy.c