From owner-svn-ports-all@FreeBSD.ORG Thu Aug 28 03:34:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE7DC3A4; Thu, 28 Aug 2014 03:34:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56F501458; Thu, 28 Aug 2014 03:34:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7S3Yq8X071663; Thu, 28 Aug 2014 03:34:52 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7S3Yqlt071662; Thu, 28 Aug 2014 03:34:52 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201408280334.s7S3Yqlt071662@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Thu, 28 Aug 2014 03:34:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366375 - head/devel/asmutils X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2014 03:34:53 -0000 Author: vanilla Date: Thu Aug 28 03:34:51 2014 New Revision: 366375 URL: http://svnweb.freebsd.org/changeset/ports/366375 QAT: https://qat.redports.org/buildarchive/r366375/ Log: 1: Fix build on -current 2: Stagify. PR: ports/193030 Submitted by: Ports Fury. Modified: head/devel/asmutils/Makefile Modified: head/devel/asmutils/Makefile ============================================================================== --- head/devel/asmutils/Makefile Thu Aug 28 03:29:06 2014 (r366374) +++ head/devel/asmutils/Makefile Thu Aug 28 03:34:51 2014 (r366375) @@ -12,12 +12,23 @@ COMMENT= Set of Unix utilities written i LICENSE= GPLv2 -ONLY_FOR_ARCHS= i386 - BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USES= gmake -MAKE_ARGS= OS=${OPSYS:tu} KERNEL=${OSREL:S/.//g} +USE_GCC= any +MAKE_ARGS= OS="${OPSYS:tu}" KERNEL="${OSREL:S/.//g}" CC="${CC}" LD="${LD}" + +ONLY_FOR_ARCHS= i386 + +# Stripping binaries will break installation +STRIP= # + +PORTDOCS= * +PLIST_FILES= ${BINS:S/^/bin\/asmutils\//:S/bonus\///} \ + ${LINKS:S/^/bin\/asmutils\//} ${LIBS:S/^/lib\/asmutils\//} +PLIST_DIRS= lib/asmutils bin/asmutils + +OPTIONS_DEFINE= DOCS # This will play merry hell with portlint(1) BINS= bonus/asmutils basename cal cat chmod chown chroot cmp cp \ @@ -34,51 +45,44 @@ BINS= bonus/asmutils basename cal cat c LINKS= arch cpuspeed domainname false halt inflate kldstat kldunload \ mkfifo more poweroff regs rmdir size sln todos umount usleep -LIBRARIES= libc.so.0 libcrypto.so.0 libm.so.0 - -PLIST_FILES= ${BINS:S/^/bin\/asmutils\//:S/bonus\///} \ - ${LINKS:S/^/bin\/asmutils\//} ${LIBRARIES:S/^/lib\/asmutils\//} -PLIST_DIRS= bin/asmutils lib/asmutils -PORTDOCS= * +LIBS= libc.so.0 libcrypto.so.0 libm.so.0 -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's,^static ,,' ${WRKSRC}/lib/libm.c - -# Stripping binaries will break installation -STRIP= # + @${REINPLACE_CMD} -e \ + 's|^static ||' ${WRKSRC}/lib/libm.c do-install: - @${MKDIR} ${PREFIX}/bin/asmutils ${PREFIX}/lib/asmutils + @${MKDIR} ${STAGEDIR}${PREFIX}/bin/asmutils .for bin in ${BINS} - ${INSTALL_PROGRAM} ${WRKSRC}/src/${bin} ${PREFIX}/bin/asmutils + (cd ${WRKSRC}/src && ${INSTALL_SCRIPT} ${bin} \ + ${STAGEDIR}${PREFIX}/bin/asmutils) .endfor -.for lib in ${LIBRARIES} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/${lib} ${PREFIX}/lib/asmutils + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/asmutils +.for lib in ${LIBS} + (cd ${WRKSRC}/lib && ${INSTALL_DATA} ${lib} \ + ${STAGEDIR}${PREFIX}/lib/asmutils) .endfor - (cd ${PREFIX}/bin/asmutils && \ - ${LN} -sf uname arch && \ - ${LN} -sf cpuinfo cpuspeed && \ - ${LN} -sf hostname domainname && \ - ${LN} -sf true false && \ - ${LN} -sf reboot halt && \ - ${LN} -sf deflate inflate && \ - ${LN} -sf kldload kldstat && \ - ${LN} -sf kldload kldunload && \ - ${LN} -sf mknod mkfifo && \ - ${LN} -sf less more && \ - ${LN} -sf reboot poweroff && \ - ${LN} -sf execve regs && \ - ${LN} -sf mkdir rmdir && \ - ${LN} -sf nm size && \ - ${LN} -sf ln sln && \ - ${LN} -sf fromdos todos && \ - ${LN} -sf mount umount && \ - ${LN} -sf sleep usleep) -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/[^i]* ${DOCSDIR} - @cd ${DOCSDIR} && ${LN} -sf Asmutils-HOWTO.html index.html -.endif + (cd ${STAGEDIR}${PREFIX}/bin/asmutils \ + && ${LN} -sf uname arch \ + && ${LN} -sf cpuinfo cpuspeed \ + && ${LN} -sf hostname domainname \ + && ${LN} -sf true false \ + && ${LN} -sf reboot halt \ + && ${LN} -sf deflate inflate \ + && ${LN} -sf kldload kldstat \ + && ${LN} -sf kldload kldunload \ + && ${LN} -sf mknod mkfifo \ + && ${LN} -sf less more \ + && ${LN} -sf reboot poweroff \ + && ${LN} -sf execve regs \ + && ${LN} -sf mkdir rmdir \ + && ${LN} -sf nm size \ + && ${LN} -sf ln sln \ + && ${LN} -sf fromdos todos \ + && ${LN} -sf mount umount \ + && ${LN} -sf sleep usleep) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${INSTALL_DATA} [^i]* ${STAGEDIR}${DOCSDIR}) + (cd ${STAGEDIR}${DOCSDIR} && ${LN} -sf Asmutils-HOWTO.html index.html) .include