svn commit: r365590 - in head/cad/spice: . files

[John Marino]

On 8/21/2014 21:41, Hiroki Sato wrote:
> Author: hrs
> Date: Thu Aug 21 19:41:06 2014
> New Revision: 365590
> URL: http://svnweb.freebsd.org/changeset/ports/365590
> QAT: https://qat.redports.org/buildarchive/r365590/
> 
> Log:
>   - Cleanup ${FILESDIR}/Makefile.
>   - Remove MAKE_JOBS_UNSAFE.
> 
> Modified:
>   head/cad/spice/Makefile
>   head/cad/spice/files/Makefile
> 
> Modified: head/cad/spice/Makefile
> ==============================================================================
> --- head/cad/spice/Makefile	Thu Aug 21 19:36:06 2014	(r365589)
> +++ head/cad/spice/Makefile	Thu Aug 21 19:41:06 2014	(r365590)
> @@ -20,7 +20,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
>  
>  WRKSRC=		${WRKDIR}/${PORTNAME}3f5
>  MAKEFILE=	${FILESDIR}/Makefile
> -MAKE_JOBS_UNSAFE=	yes
> +MAKE_ENV=	WITH_INSTALL_AS_USER=yes
> +ALL_TARGET=	build _manpages
>  
>  PORTDOCS=	spice3f3.ps.gz
>  PORTEXAMPLES=	bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
> 
> Modified: head/cad/spice/files/Makefile
> ==============================================================================
> --- head/cad/spice/files/Makefile	Thu Aug 21 19:36:06 2014	(r365589)
> +++ head/cad/spice/files/Makefile	Thu Aug 21 19:41:06 2014	(r365590)
> @@ -1,31 +1,34 @@
>  #
>  # $FreeBSD$
>  #
> -all:
> +build:
>  	${SH} util/build FreeBSD default
> +	strip ${PROGRAMS:S,^,FreeBSD/obj/bin/,}
>  
> -install:
> -	mkdir -p ${DESTDIR}${PREFIX}/share/spice/helpdir \
> -		${DESTDIR}${PREFIX}/share/spice/scripts
> -	cd FreeBSD/obj/bin && \
> -		${BSD_INSTALL_PROGRAM} \
> -		    spice3 nutmeg sconvert help proc2mod multidec \
> -		    ${DESTDIR}${PREFIX}/bin
> -	${BSD_INSTALL_DATA} lib/helpdir/spice.txt \
> -		${DESTDIR}${PREFIX}/share/spice/helpdir
> -	${BSD_INSTALL_SCRIPT} lib/scripts/setplot lib/scripts/spinit \
> -		${DESTDIR}${PREFIX}/share/spice/scripts
> -	${BSD_INSTALL_DATA} lib/mfbcap lib/news \
> -		${DESTDIR}${PREFIX}/share/spice
> -	${BSD_INSTALL_MAN} man/man5/mfbcap.5 \
> -		${DESTDIR}${PREFIX}/man/man5/mfbcap.5
> -	${BSD_INSTALL_MAN} man/man1/sconvert.1 \
> -		${DESTDIR}${PREFIX}/man/man1/sconvert.1
> -	${BSD_INSTALL_MAN} man/man1/nutmeg.1 \
> -		${DESTDIR}${PREFIX}/man/man1/nutmeg.1
> -	${BSD_INSTALL_MAN} man/man1/spice.1 \
> -		${DESTDIR}${PREFIX}/man/man1/spice.1
> -	${BSD_INSTALL_MAN} man/man1/spice.1 \
> -		${DESTDIR}${PREFIX}/man/man1/spice3.1
> -	${BSD_INSTALL_MAN} man/man3/mfb.3 \
> -		${DESTDIR}${PREFIX}/man/man3/mfb.3
> +PREFIX?=	/usr/local
> +
> +BINDIR=		${PREFIX}/bin
> +SHAREFILESDIR=	${PREFIX}/share/spice
> +HELPFILESDIR=	${SHAREFILESDIR}/helpdir
> +SCRIPTFILESDIR=	${SHAREFILESDIR}/scripts
> +
> +FILESGROUPS=	PROGRAMS HELPFILES SCRIPTFILES SHAREFILES
> +
> +PROGRAMSMODE=	${BINMODE}
> +PROGRAMSOWN=	${BINOWN}
> +PROGRAMSGRP=	${BINGRP}
> +
> +PROGRAMS=	spice3 nutmeg sconvert help proc2mod multidec
> +HELPFILES=	spice.txt
> +SCRIPTFILES=	setplot spinit
> +SHAREFILES=	mfbcap news
> +
> +MAN=	spice.1 nutmeg.1 sconvert.1 mfb.3 mfbcap.5
> +MLINKS=	spice.1 spice3.1
> +MANDIR=	${PREFIX}/man/man
> +
> +beforeinstall:
> +	mkdir -p ${DESTDIR}${HELPFILESDIR} ${DESTDIR}${SCRIPTFILESDIR}
> +
> +.PATH: FreeBSD/obj/bin lib/helpdir lib/scripts lib man/man1 man/man3 man/man5
> +.include <bsd.prog.mk>


I'm sorry, but using freebsd-specific <bsd.prog.mk> in a ports vendor
makefile is NOT an improvement and frankly puts the build at risk on
DragonFly.

I wish there was a rule that ports should not use system make fragments.
 This is not a good practice.  This port had a perfectly working and
generic makefile before.

There's a good chance this just broke spice on DragonFly as the system
make file these are different.

John