--- a/components/patch/Makefile	Tue Oct 07 14:20:21 2014 -0700
+++ b/components/patch/Makefile	Wed Oct 08 09:18:56 2014 -0700
@@ -24,16 +24,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		patch
-COMPONENT_VERSION=	2.5.9
+COMPONENT_VERSION=	2.7.1
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/patch/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a
+    sha256:c05f28668c3474bc63adcd48abae921d15e71c254fbebdbaeda40456d64039d5
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/patch/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gpatch
 
-TPNO=			8588
+TPNO=			18936
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -41,6 +41,8 @@
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
+COMPONENT_INSTALL_ARGS += bindir=$(USRBINDIR)
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
@@ -48,7 +50,7 @@
 
 install:	$(INSTALL_64)
 
-test:		$(NO_TESTS)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- a/components/patch/patch.p5m	Tue Oct 07 14:20:21 2014 -0700
+++ b/components/patch/patch.p5m	Wed Oct 08 09:18:56 2014 -0700
@@ -32,7 +32,7 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/1999/555
+    value=PSARC/1999/555 value=PSARC/2014/324
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file usr/bin/patch path=usr/gnu/bin/patch
 file usr/share/man/man1/patch.1 path=usr/gnu/share/man/man1/patch.1

--- a/components/patch/patches/DESTDIR.patch	Tue Oct 07 14:20:21 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- patch-2.5.9/Makefile.in.orig	Tue May 20 09:15:48 2003
-+++ patch-2.5.9/Makefile.in	Thu Feb  3 13:41:39 2011
-@@ -112,11 +112,11 @@
- 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install:: all installdirs
--	$(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT)
--	-$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext)
-+	$(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)/$(bindir)/$(patch_name)$(EXEEXT)
-+	-$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)/$(man1dir)/$(patch_name)$(man1ext)
- 
- installdirs::
--	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir)
-+	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(man1dir)
- 
- install-strip::
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install