mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Instead of hand-rolled `do-install' target, make existing installation

Browse Source 
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.
This commit is contained in:
Alexey Dokuchaev 2018-12-26 09:34:28 +00:00
parent ab4a512a23
commit 70ce94ec9d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=488366
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archivers/libdeflate/Makefile
View File

@ -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}

30
archivers/libdeflate/files/patch-Makefile Normal file
View File

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