aboutsummaryrefslogtreecommitdiff
path: root/archivers/liblz4
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2015-05-19 16:37:07 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2015-05-19 16:37:07 +0000
commite9ef92fc48ae812e5abb8c791944ee2aa639ab2e (patch)
tree6fed2e88ebe4bd22b5a9753a48d317a813ec8cef /archivers/liblz4
parent1300b67b4ab5ebb3759334f3e813b47bdf807389 (diff)
downloadports-e9ef92fc48ae812e5abb8c791944ee2aa639ab2e.tar.gz
ports-e9ef92fc48ae812e5abb8c791944ee2aa639ab2e.zip
Remove the CONFLICTS on archivers/lz4 which was removed from the ports tree.
Notes
Notes: svn path=/head/; revision=386791
Diffstat (limited to 'archivers/liblz4')
-rw-r--r--archivers/liblz4/Makefile8
-rw-r--r--archivers/liblz4/distinfo4
2 files changed, 5 insertions, 7 deletions
diff --git a/archivers/liblz4/Makefile b/archivers/liblz4/Makefile
index e789f0ace543..efe19d9d6341 100644
--- a/archivers/liblz4/Makefile
+++ b/archivers/liblz4/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= lz4
-PORTVERSION= 128
+PORTVERSION= 129
DISTVERSIONPREFIX= r
CATEGORIES= archivers
PKGNAMEPREFIX= lib
@@ -16,21 +16,19 @@ LICENSE_COMB= multi
USE_GITHUB= yes
GH_ACCOUNT= Cyan4973
-CONFLICTS= lz4-*
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}
USES= gmake pkgconfig
USE_LDCONFIG= yes
ALL_TARGET= default # don't remove this
-SO_VER= 1.6.0
+SO_VER= 1.7.0
PLIST_SUB+= SO_VER=${SO_VER} SO_VER_MAJ=${SO_VER:R:R}
post-patch:
${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
-e 's/LIBDIR?=/LOCALLIBDIR=/; s/$$(LIBDIR)/$$(LOCALLIBDIR)/g' \
-e 's|$$(LOCALLIBDIR)/pkgconfig|$$(PREFIX)/libdata/pkgconfig|' \
- -e '/^MANDIR=/s|share/||' \
+ -e '/^MANDIR :=/s|share/||' \
-e 's/kFreeBSD/& FreeBSD/' \
-e 's|$$(MAKE)|${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}|'
${REINPLACE_CMD} -e '/^all:/s/$$/ liblz4.pc/' \
diff --git a/archivers/liblz4/distinfo b/archivers/liblz4/distinfo
index d4cc7c749374..0df03709ccca 100644
--- a/archivers/liblz4/distinfo
+++ b/archivers/liblz4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Cyan4973-lz4-r128_GH0.tar.gz) = cb08a99a9d0bea4aa5a4707070c574fc0e4dab549522a171b8078b8a1f50c7d1
-SIZE (Cyan4973-lz4-r128_GH0.tar.gz) = 157689
+SHA256 (Cyan4973-lz4-r129_GH0.tar.gz) = f681f5528a6d16b23246db499f30717cda354079a684298375c4d74c6f475a01
+SIZE (Cyan4973-lz4-r129_GH0.tar.gz) = 126744