From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 18 10:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B3F73C6C for ; Thu, 18 Jul 2013 10:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 97A572CF for ; Thu, 18 Jul 2013 10:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IA001o026994 for ; Thu, 18 Jul 2013 10:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r6IA003p026993; Thu, 18 Jul 2013 10:00:00 GMT (envelope-from gnats) Resent-Date: Thu, 18 Jul 2013 10:00:00 GMT Resent-Message-Id: <201307181000.r6IA003p026993@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "r4721@tormail.org" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 259B3A21 for ; Thu, 18 Jul 2013 09:52:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) by mx1.freebsd.org (Postfix) with ESMTP id 1804D27A for ; Thu, 18 Jul 2013 09:52:18 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r6I9qHfU091092 for ; Thu, 18 Jul 2013 09:52:17 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r6I9qHXN091087; Thu, 18 Jul 2013 09:52:17 GMT (envelope-from nobody) Message-Id: <201307180952.r6I9qHXN091087@oldred.freebsd.org> Date: Thu, 18 Jul 2013 09:52:17 GMT From: "r4721@tormail.org" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/180626: [patch] install missing files in sysutils/syslinux X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jul 2013 10:00:00 -0000 >Number: 180626 >Category: ports >Synopsis: [patch] install missing files in sysutils/syslinux >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 18 10:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: r4721@tormail.org >Release: >Organization: >Environment: >Description: port installs only a list of certain selected files, which is no longer in sync with all needed files. * add license * switch from using specified list of files to copying tree out of build directory * switch to dynamic plist * quiet installation process removed files: pkg-plist >How-To-Repeat: >Fix: Patch attached with submission follows: Index: sysutils/syslinux/Makefile =================================================================== --- sysutils/syslinux/Makefile (revision 323209) +++ sysutils/syslinux/Makefile (working copy) @@ -10,6 +10,7 @@ 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,19 +24,10 @@ MAN1= syslinux.1 +PLIST_FILES+= bin/syslinux + .include -# 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 - # convert elf_i386 to elf_i386_fbsd pre-patch: @(cd ${WRKSRC}; \ @@ -46,16 +38,15 @@ @${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 Index: sysutils/syslinux/pkg-plist =================================================================== --- sysutils/syslinux/pkg-plist (revision 323209) +++ sysutils/syslinux/pkg-plist (working copy) @@ -1,56 +0,0 @@ -bin/syslinux -%%DATADIR%%/cat.c32 -%%DATADIR%%/chain.c32 -%%DATADIR%%/cmd.c32 -%%DATADIR%%/config.c32 -%%DATADIR%%/cptime.c32 -%%DATADIR%%/cpuid.c32 -%%DATADIR%%/cpuidtest.c32 -%%DATADIR%%/disk.c32 -%%DATADIR%%/dmitest.c32 -%%DATADIR%%/elf.c32 -%%DATADIR%%/ethersel.c32 -%%DATADIR%%/gfxboot.c32 -%%DATADIR%%/gptmbr.bin -%%DATADIR%%/gpxecmd.c32 -%%DATADIR%%/gpxelinux.0 -%%DATADIR%%/hdt.c32 -%%DATADIR%%/hexdump.c32 -%%DATADIR%%/host.c32 -%%DATADIR%%/ifcpu.c32 -%%DATADIR%%/ifcpu64.c32 -%%DATADIR%%/ifmemdsk.c32 -%%DATADIR%%/ifplop.c32 -%%DATADIR%%/isolinux.bin -%%DATADIR%%/kbdmap.c32 -%%DATADIR%%/kontron_wdt.c32 -%%DATADIR%%/ldlinux.c32 -%%DATADIR%%/libcom32.c32 -%%DATADIR%%/liblua.c32 -%%DATADIR%%/libmenu.c32 -%%DATADIR%%/linux.c32 -%%DATADIR%%/ls.c32 -%%DATADIR%%/lua.c32 -%%DATADIR%%/mboot.c32 -%%DATADIR%%/mbr.bin -%%DATADIR%%/memdisk -%%DATADIR%%/meminfo.c32 -%%DATADIR%%/menu.c32 -%%DATADIR%%/pcitest.c32 -%%DATADIR%%/pmload.c32 -%%DATADIR%%/poweroff.c32 -%%DATADIR%%/prdhcp.c32 -%%DATADIR%%/pwd.c32 -%%DATADIR%%/pxechn.c32 -%%DATADIR%%/pxelinux.0 -%%DATADIR%%/reboot.c32 -%%DATADIR%%/rosh.c32 -%%DATADIR%%/sanboot.c32 -%%DATADIR%%/sdi.c32 -%%DATADIR%%/sysdump.c32 -%%DATADIR%%/vesainfo.c32 -%%DATADIR%%/vesamenu.c32 -%%DATADIR%%/vpdtest.c32 -%%DATADIR%%/whichsys.c32 -%%DATADIR%%/zzjson.c32 -@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: