From owner-svn-ports-head@FreeBSD.ORG Sat Aug 3 19:12:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8B2DC58E; Sat, 3 Aug 2013 19:12:46 +0000 (UTC) (envelope-from nox@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5E97D2B10; Sat, 3 Aug 2013 19:12:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r73JCk5e033776; Sat, 3 Aug 2013 19:12:46 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r73JCkrh033775; Sat, 3 Aug 2013 19:12:46 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201308031912.r73JCkrh033775@svn.freebsd.org> From: Juergen Lock Date: Sat, 3 Aug 2013 19:12:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324200 - head/sysutils/syslinux X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Aug 2013 19:12:46 -0000 Author: nox Date: Sat Aug 3 19:12:45 2013 New Revision: 324200 URL: http://svnweb.freebsd.org/changeset/ports/324200 Log: - Install missing files by switching from using specified list of files to copying tree out of build directory. - Add license. - Switch to dynamic plist. - Quiet installation process. PR: ports/180626 Submitted by: r4721@tormail.org Deleted: head/sysutils/syslinux/pkg-plist Modified: head/sysutils/syslinux/Makefile Modified: head/sysutils/syslinux/Makefile ============================================================================== --- head/sysutils/syslinux/Makefile Sat Aug 3 19:02:27 2013 (r324199) +++ head/sysutils/syslinux/Makefile Sat Aug 3 19:12:45 2013 (r324200) @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Boot loader for the Linux operating system LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools @@ -23,18 +24,9 @@ ALL_TARGET= bios MAN1= syslinux.1 -.include +PLIST_FILES+= bin/syslinux -# utility target to build pkg-plist -_A = mbr/mbr.bin mbr/gptmbr.bin \ - core/pxelinux.0 core/isolinux.bin gpxe/gpxelinux.0 \ - memdisk/memdisk \ - com32/chain/*.c32 com32/cmenu/libmenu/libmenu.c32 \ - com32/elflink/ldlinux/*.c32 com32/gfxboot/*.c32 \ - com32/hdt/*.c32 com32/lib/*.c32 \ - com32/lua/src/*.c32 com32/mboot/*.c32 \ - com32/menu/*.c32 com32/modules/*.c32 \ - com32/rosh/*.c32 com32/sysdump/*.c32 +.include # convert elf_i386 to elf_i386_fbsd pre-patch: @@ -46,16 +38,15 @@ post-patch: @${REINPLACE_CMD} -e \ 's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk -build_pkg-plist: - @( ${ECHO_CMD} "bin/syslinux" ; \ - cd ${WRKSRC}; for i in ${_A} ; do \ - ${ECHO_CMD} share/syslinux/`basename $$i` ; done ; \ - ${ECHO_CMD} "@dirrm share/syslinux" ) - do-install: - (cd ${WRKSRC}/bios/mtools && ${INSTALL_PROGRAM} syslinux ${PREFIX}/bin) - (cd ${WRKSRC}/man && ${INSTALL_MAN} syslinux.1 ${MANPREFIX}/man/man1) + @${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${MANPREFIX}/man/man1 + @${FIND} -d ${WRKSRC} -type d -empty -delete @${MKDIR} ${DATADIR} - (cd ${WRKSRC}/bios && ${INSTALL_DATA} ${_A} ${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${DATADIR}) + +post-install: + @(cd ${PREFIX} && ${FIND} -d ${DATADIR_REL} -type f >> ${TMPPLIST}) + @(cd ${PREFIX} && ${FIND} -d ${DATADIR_REL} -type d -exec echo "@dirrm {}" \; >> ${TMPPLIST}) .include