diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-05-08 22:24:50 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-05-08 22:24:50 +0000 |
| commit | 8656b71ea37721b65748a52c2638e667b5ed427e (patch) | |
| tree | 6631c4826c4e9a7cfe5a3093a44346b2c0bf20f7 /sysutils/squashfs-tools | |
| parent | a31261e0380823cf341715181b42b5fae4d8c7a9 (diff) | |
| download | ports-8656b71ea37721b65748a52c2638e667b5ed427e.tar.gz ports-8656b71ea37721b65748a52c2638e667b5ed427e.zip | |
. Support staging
. s/USE_GMAKE/USES=gmake/
. New LIB_DEPENDS syntax
Approved by: portmgr (blanket)
Notes
Notes:
svn path=/head/; revision=353361
Diffstat (limited to 'sysutils/squashfs-tools')
| -rw-r--r-- | sysutils/squashfs-tools/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile | 29 |
2 files changed, 28 insertions, 15 deletions
diff --git a/sysutils/squashfs-tools/Makefile b/sysutils/squashfs-tools/Makefile index 520a5ee67999..0d810d5cd78e 100644 --- a/sysutils/squashfs-tools/Makefile +++ b/sysutils/squashfs-tools/Makefile @@ -25,9 +25,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/squashfs-tools 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> diff --git a/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile b/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile index f5e94fbe311b..c4c402928c27 100644 --- a/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile +++ b/sysutils/squashfs-tools/files/patch-squashfs-tools_Makefile @@ -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 |