Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Aug 2013 19:20:01 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/180626: commit references a PR
Message-ID:  <201308031920.r73JK1u8026069@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/180626; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180626: commit references a PR
Date: Sat,  3 Aug 2013 19:12:54 +0000 (UTC)

 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 <bsd.port.pre.mk>
 +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 <bsd.port.pre.mk>
  
  # 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 <bsd.port.post.mk>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308031920.r73JK1u8026069>