- Update to version 1.3.4, which had integrated some of our patches

- Further offload patches by setting some make(1) variables; this also
  allows to install binaries and libraries properly stripped (subject
  to WITH_DEBUG) and retire this ugly `post-install' target
- Prefer to install shared program rather than statically linked one

Reported by:	portscout

TIMESTAMP (rhash-1.3.4-src.tar.gz) = 1478556322

4 files changed, 41 insertions, 62 deletions

diff --git a/security/rhash/Makefile b/security/rhash/Makefile
index 071c90ba041b..4d16cf5116af 100644
--- a/security/rhash/Makefile
+++ b/security/rhash/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rhash
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	security
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,6 +14,11 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_LDCONFIG=	yes
+MAKE_ARGS=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SHARED="${INSTALL_PROGRAM}" \
+		MANDIR="${PREFIX}/man"
+ALL_TARGET=	build-shared
+INSTALL_TARGET=	install-shared
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -26,10 +31,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/BYTE_ORDER/s,__,_,g' \
 		${WRKSRC}/librhash/byte_order.h
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rhash \
-		${STAGEDIR}${PREFIX}/lib/librhash.so
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/security/rhash/distinfo b/security/rhash/distinfo
index 736f6ecb6fd0..0ccfeb025acf 100644
--- a/security/rhash/distinfo
+++ b/security/rhash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rhash-1.3.3-src.tar.gz) = 5b520b597bd83f933d316fce1382bb90e0b0b87b559b8c9c9a197551c935315a
-SIZE (rhash-1.3.3-src.tar.gz) = 248855
+TIMESTAMP = 1478556322
+SHA256 (rhash-1.3.4-src.tar.gz) = 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49
+SIZE (rhash-1.3.4-src.tar.gz) = 249357
diff --git a/security/rhash/files/patch-Makefile b/security/rhash/files/patch-Makefile
index f93867fe6f68..54ec56fab093 100644
--- a/security/rhash/files/patch-Makefile
+++ b/security/rhash/files/patch-Makefile
@@ -1,50 +1,41 @@
---- Makefile.orig	2014-08-04 18:55:26 UTC
+--- Makefile.orig	2016-11-05 23:22:07 UTC
 +++ Makefile
-@@ -3,13 +3,13 @@
- # compile for pentiumpro: make CFLAGS="-O2 -DNDEBUG -march=i586 -mcpu=pentiumpro -fomit-frame-pointer"
- # create rpm with statically linked program: make rpm ADDLDFLAGS="-static -s -Wl,--gc-sections"
- VERSION = 1.3.3
--PREFIX  = /usr/local
--CC      = gcc
-+PREFIX  ?= /usr/local
-+CC      ?= gcc
+@@ -6,9 +6,9 @@ VERSION = 1.3.4
+ PREFIX  ?= /usr/local
+ CC      ?= gcc
  # using OPTFLAGS/OPTLDFLAGS for compatibilty with old scripts using this makefile
 -OPTFLAGS = -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
-+OPTFLAGS = $(CFLAGS) -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
++OPTFLAGS = -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
  OPTLDFLAGS =
 -CFLAGS = $(OPTFLAGS)
--LDFLAGS = $(OPTLDFLAGS)
-+#CFLAGS = $(OPTFLAGS)
-+LDFLAGS += $(OPTLDFLAGS)
++CFLAGS += $(OPTFLAGS)
+ LDFLAGS = $(OPTLDFLAGS)
  ADDCFLAGS =
  ADDLDFLAGS =
- ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \
-@@ -55,7 +55,7 @@ I18N_FILES = po/de.po po/en_AU.po po/es.
- DIST_FILES     = $(LIN_DIST_FILES) $(LIBRHASH_FILES) $(WIN_DIST_FILES) $(WIN_SRC_FILES) $(I18N_FILES)
- DESTDIR = 
- BINDIR  = $(PREFIX)/bin
--MANDIR  = $(PREFIX)/share/man
-+MANDIR  = $(PREFIX)/man
- LOCALEDIR = $(PREFIX)/share/locale
- RPMTOP  = rpms
- RPMDIRS = SOURCES SPECS BUILD SRPMS RPMS
-@@ -70,7 +70,7 @@ build-shared: $(SHARED_TRG)
- lib-shared: $(SHAREDLIB)
+@@ -71,7 +71,7 @@ lib-shared: $(SHAREDLIB)
  lib-static: $(LIBRHASH)
  
--install: all install-binary install-data install-symlinks
-+install: all install-binary install-lib-static install-lib-shared install-data install-symlinks
- install-shared: $(SHARED_TRG) install-shared-binary install-data install-symlinks
+ install: all install-binary install-data install-symlinks
+-install-shared: $(SHARED_TRG) install-shared-binary install-data install-symlinks
++install-shared: $(SHARED_TRG) install-shared-binary install-lib-static install-lib-shared install-data install-symlinks
  install-data: install-man install-conf
  uninstall: uninstall-binary uninstall-data uninstall-symlinks
-@@ -105,8 +105,8 @@ install-man:
- 	$(INSTALL_DATA) dist/rhash.1 $(DESTDIR)$(MANDIR)/man1/rhash.1
+ 
+@@ -106,7 +106,7 @@ install-man:
  
  install-conf:
--	$(INSTALL) -d $(DESTDIR)/etc
--	sed -e 's/\x0D//g' dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(DESTDIR)/etc/rhashrc
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/etc
+ 	$(INSTALL) -d $(DESTDIR)/etc
+-	tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(DESTDIR)/etc/rhashrc
 +	tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp $(DESTDIR)$(PREFIX)/etc/rhashrc.sample
  	rm -f rc.tmp
  
  # dependencies should be properly set, otherwise 'make -j<n>' can fail
+@@ -127,7 +127,7 @@ install-lib-static: $(LIBRHASH)
+ 	+make -C librhash install-lib-static
+ 
+ install-lib-shared: $(SHAREDLIB)
+-	+make -C librhash install-lib-shared
++	+make -C librhash install-lib-shared install-so-link
+ 
+ $(SHAREDLIB):
+ 	+make -C librhash lib-shared
diff --git a/security/rhash/files/patch-librhash_Makefile b/security/rhash/files/patch-librhash_Makefile
index 9f6ddad7afa6..3b7f85bf4526 100644
--- a/security/rhash/files/patch-librhash_Makefile
+++ b/security/rhash/files/patch-librhash_Makefile
@@ -1,32 +1,18 @@
---- librhash/Makefile.orig	2014-08-01 10:53:45 UTC
+--- librhash/Makefile.orig	2016-11-06 15:49:40 UTC
 +++ librhash/Makefile
-@@ -1,11 +1,11 @@
- # Makefile for LibRHash
--CC      = gcc
--AR      = ar
-+CC      ?= gcc
-+AR      ?= ar
+@@ -2,9 +2,9 @@
+ CC      ?= gcc
+ AR      ?= ar
  #NOTE: NDEBUG turns off asserts
 -OPTFLAGS   = -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
-+OPTFLAGS   = $(CFLAGS) -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
++OPTFLAGS   = -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
  OPTLDFLAGS =
 -CFLAGS     = $(OPTFLAGS)
--LDFLAGS    = $(OPTLDFLAGS)
-+#CFLAGS     = $(OPTFLAGS)
-+LDFLAGS    += $(OPTLDFLAGS)
++CFLAGS     += $(OPTFLAGS)
+ LDFLAGS    = $(OPTLDFLAGS)
  ADDCFLAGS  =
  LIBCFLAGS  =
- ADDLDFLAGS =
-@@ -24,7 +24,7 @@ LEGACY_LIB_HEADERS = rhash_timing.h
- SO_HEADERS = $(LIB_HEADERS) $(LEGACY_LIB_HEADERS)
- # installation directories and names
- DESTDIR =
--PREFIX  = /usr/local
-+PREFIX  ?= /usr/local
- INCDIR  = $(PREFIX)/include
- LIBDIR  = $(PREFIX)/lib
- LIBRARY = librhash.a
-@@ -182,7 +182,7 @@ test-dll: $(DLLNAME) test_hashes.o
+@@ -187,7 +187,7 @@ test-dll: $(DLLNAME) test_hashes.o
  
  # shared and static libraries
  $(SONAME): $(SOURCES)