Date: Thu, 8 May 2014 22:24:51 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353361 - in head/sysutils/squashfs-tools: . files Message-ID: <201405082224.s48MOpkn043284@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Thu May 8 22:24:50 2014 New Revision: 353361 URL: http://svnweb.freebsd.org/changeset/ports/353361 QAT: https://qat.redports.org/buildarchive/r353361/ Log: . Support staging . s/USE_GMAKE/USES=gmake/ . New LIB_DEPENDS syntax Approved by: portmgr (blanket) Modified: head/sysutils/squashfs-tools/Makefile head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile Modified: head/sysutils/squashfs-tools/Makefile ============================================================================== --- head/sysutils/squashfs-tools/Makefile Thu May 8 22:06:30 2014 (r353360) +++ head/sysutils/squashfs-tools/Makefile Thu May 8 22:24:50 2014 (r353361) @@ -25,9 +25,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/squashfs- USE_CSTD= gnu89 -USE_GMAKE= yes +USES= gmake -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} @@ -41,18 +40,15 @@ MAKE_ARGS+= XZ_SUPPORT=1 .if ${PORT_OPTIONS:MLZO} MAKE_ARGS+= LZO_SUPPORT=1 LZO_DIR=${LOCALBASE} -LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2 +LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 .endif post-patch: - @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \ - -e "s|^\(XATTR\)|# \1|g" \ + @${REINPLACE_CMD} -e "s|^\(XATTR\)|# \1|g" \ ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC:H}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC:H}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile ============================================================================== --- head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile Thu May 8 22:06:30 2014 (r353360) +++ head/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile Thu May 8 22:24:50 2014 (r353361) @@ -1,15 +1,32 @@ - $FreeBSD$ ---- Makefile.orig -+++ Makefile -@@ -103,8 +103,8 @@ +--- Makefile.orig 2011-02-28 17:04:15.000000000 -0300 ++++ Makefile 2014-05-08 11:03:24.000000000 -0300 +@@ -38,7 +38,7 @@ + # installation prefix. + # + #LZO_SUPPORT = 1 +-#LZO_DIR = /usr/local ++#LZO_DIR = $(LOCALBASE) + + ########### Building LZMA support ############# + # +@@ -103,7 +103,7 @@ CFLAGS ?= -O2 CFLAGS += $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 \ - -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" \ + -D_LARGEFILE_SOURCE -DFNM_EXTMATCH=0 -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" \ - -Wall + -Wall LIBS = -lpthread -lm - ifeq ($(GZIP_SUPPORT),1) +@@ -253,6 +253,6 @@ + + .PHONY: install + install: mksquashfs unsquashfs +- mkdir -p $(INSTALL_DIR) +- cp mksquashfs $(INSTALL_DIR) +- cp unsquashfs $(INSTALL_DIR) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_PROGRAM} mksquashfs $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_PROGRAM} unsquashfs $(DESTDIR)$(PREFIX)/bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405082224.s48MOpkn043284>