svn commit: r488366 - in head/archivers/libdeflate: . files

[Alexey Dokuchaev]

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 at 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) \