Index: head/security/rhash/Makefile =================================================================== --- head/security/rhash/Makefile (revision 452986) +++ head/security/rhash/Makefile (revision 452987) @@ -1,41 +1,41 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= rhash -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.5 CATEGORIES= security MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= danfe@FreeBSD.org COMMENT= Utility and library for computing and checking of file hashes 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 +INSTALL_TARGET= install-shared install-lib-static install-lib-shared -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/RHash-${PORTVERSION} PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,/etc/,${PREFIX}&,' ${WRKSRC}/parse_cmdline.c @${REINPLACE_CMD} -e '/BYTE_ORDER/s,__,_,g' \ ${WRKSRC}/librhash/byte_order.h post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} do-test: cd ${WRKSRC}/tests && ${SH} test_rhash.sh --full .include Index: head/security/rhash/distinfo =================================================================== --- head/security/rhash/distinfo (revision 452986) +++ head/security/rhash/distinfo (revision 452987) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478556322 -SHA256 (rhash-1.3.4-src.tar.gz) = 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 -SIZE (rhash-1.3.4-src.tar.gz) = 249357 +TIMESTAMP = 1502675104 +SHA256 (rhash-1.3.5-src.tar.gz) = 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e +SIZE (rhash-1.3.5-src.tar.gz) = 316867 Index: head/security/rhash/files/patch-Makefile =================================================================== --- head/security/rhash/files/patch-Makefile (revision 452986) +++ head/security/rhash/files/patch-Makefile (revision 452987) @@ -1,41 +1,32 @@ --- Makefile.orig 2016-11-05 23:22:07 UTC +++ Makefile @@ -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 = -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections OPTLDFLAGS = -CFLAGS = $(OPTFLAGS) +CFLAGS += $(OPTFLAGS) LDFLAGS = $(OPTLDFLAGS) ADDCFLAGS = ADDLDFLAGS = -@@ -71,7 +71,7 @@ lib-shared: $(SHAREDLIB) - lib-static: $(LIBRHASH) - - 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 - @@ -106,7 +106,7 @@ install-man: install-conf: $(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' 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 +- +$(MAKE) -C librhash install-lib-shared ++ +$(MAKE) -C librhash install-lib-shared install-so-link $(SHAREDLIB): +make -C librhash lib-shared