From owner-svn-ports-head@freebsd.org Wed Dec 26 09:34:29 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7481E13494A5; Wed, 26 Dec 2018 09:34:29 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1BF9C6ED66; Wed, 26 Dec 2018 09:34:29 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09C3621BA8; Wed, 26 Dec 2018 09:34:29 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBQ9YSoS001389; Wed, 26 Dec 2018 09:34:28 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBQ9YSg4001387; Wed, 26 Dec 2018 09:34:28 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201812260934.wBQ9YSg4001387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 26 Dec 2018 09:34:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488366 - in head/archivers/libdeflate: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/archivers/libdeflate: . files X-SVN-Commit-Revision: 488366 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1BF9C6ED66 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2018 09:34:29 -0000 Author: danfe Date: Wed Dec 26 09:34:28 2018 New Revision: 488366 URL: https://svnweb.freebsd.org/changeset/ports/488366 Log: Instead of hand-rolled `do-install' target, make existing installation routine PREFIX-aware and compatible with our install(1). As a bonus, it would install prefixed binaries to avoid potential clash with other gzip and gunzip implementations. Added: head/archivers/libdeflate/files/ head/archivers/libdeflate/files/patch-Makefile (contents, props changed) Modified: head/archivers/libdeflate/Makefile Modified: head/archivers/libdeflate/Makefile ============================================================================== --- head/archivers/libdeflate/Makefile Wed Dec 26 09:30:18 2018 (r488365) +++ head/archivers/libdeflate/Makefile Wed Dec 26 09:34:28 2018 (r488366) @@ -4,6 +4,7 @@ PORTNAME= libdeflate PORTVERSION= 1.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= archivers MAINTAINER= danfe@FreeBSD.org @@ -18,23 +19,14 @@ USE_LDCONFIG= yes MAKE_ARGS= V=1 -PLIST_FILES= bin/gunzip bin/gzip \ +PLIST_FILES= bin/libdeflate-gunzip bin/libdeflate-gzip \ include/libdeflate.h \ lib/libdeflate.a lib/libdeflate.so lib/libdeflate.so.0 PORTDOCS= NEWS README.md OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's| -O2 -fomit-frame-pointer||' ${WRKSRC}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gunzip ${WRKSRC}/gzip \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/libdeflate.h ${STAGEDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/libdeflate.[as]* ${STAGEDIR}${PREFIX}/lib - -do-install-DOCS-on: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Added: head/archivers/libdeflate/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/libdeflate/files/patch-Makefile Wed Dec 26 09:34:28 2018 (r488366) @@ -0,0 +1,30 @@ +--- Makefile.orig 2018-12-23 19:13:28 UTC ++++ Makefile +@@ -21,7 +21,7 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o + 1>&2 2>/dev/null; then echo $(1); fi) + + override CFLAGS := \ +- $(CFLAGS) -O2 -fomit-frame-pointer -std=c99 -I. -Icommon \ ++ $(CFLAGS) -std=c99 -I. -Icommon \ + -Wall -Wundef \ + $(call cc-option,-Wpedantic) \ + $(call cc-option,-Wdeclaration-after-statement) \ +@@ -227,12 +227,12 @@ DEFAULT_TARGETS += gunzip$(PROG_SUFFIX) + all:$(DEFAULT_TARGETS) + + install:all +- install -Dm644 -t $(DESTDIR)/usr/lib $(STATIC_LIB) +- install -Dm755 -t $(DESTDIR)/usr/lib $(SHARED_LIB) +- ln -sf $(SHARED_LIB) $(DESTDIR)/usr/lib/libdeflate.so +- install -Dm644 -t $(DESTDIR)/usr/include libdeflate.h +- install -Dm755 gzip $(DESTDIR)/usr/bin/libdeflate-gzip +- ln -f $(DESTDIR)/usr/bin/libdeflate-gzip $(DESTDIR)/usr/bin/libdeflate-gunzip ++ install -Dm644 $(STATIC_LIB) $(DESTDIR)$(PREFIX)/lib ++ install -s -Dm755 $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib ++ ln -sf $(SHARED_LIB) $(DESTDIR)$(PREFIX)/lib/libdeflate.so ++ install -Dm644 libdeflate.h $(DESTDIR)$(PREFIX)/include ++ install -s -Dm755 gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip ++ ln -f $(DESTDIR)$(PREFIX)/bin/libdeflate-gzip $(DESTDIR)$(PREFIX)/bin/libdeflate-gunzip + + uninstall: + rm -f $(DESTDIR)/usr/lib/$(STATIC_LIB) \