pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/45046: mk/* minix support
The following reply was made to PR pkg/45046; it has been noted by GNATS.
From: Joerg Sonnenberger <joerg%britannica.bec.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/45046: mk/* minix support
Date: Fri, 17 Jun 2011 19:00:49 +0200
On Fri, Jun 17, 2011 at 03:20:04PM +0000, Thomas Cort wrote:
> diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
> index 094f902..874dcdd 100644
> --- a/mk/bsd.pkg.mk
> +++ b/mk/bsd.pkg.mk
> @@ -482,7 +482,7 @@ PKG_FAIL_REASON+= "${PKGNAME} is restricted:" \
> PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong
> cryptography"
> . endif
> . endif
> -. if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE})
> +. if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE})
> && (${OPSYS} != "Minix")
> PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
> . endif
> . if defined(BROKEN)
Why do you need this? It sounds wrong to remove this check as it
basically just indicates that your X11BASE setting is wrong (or the
X11_TYPE).
> @@ -647,7 +647,11 @@ _BIN_INSTALL_FLAGS+= -A
> .endif
> _BIN_INSTALL_FLAGS+= ${PKG_ARGS_ADD}
>
> +.if ${OPSYS} == "Minix"
> +_SHORT_UNAME_R= ${:!${UNAME} -r!:} # full uname -r output
> +.else
> _SHORT_UNAME_R= ${:!${UNAME} -r!:C@\.([0-9]*)[_.-].*@.\1@} #
> n.n[_.]anything => n.n
> +.endif
This is only used by BINPKG_SITES and that doesn't provide a value for
!NetBSD && !DragonFly. If your own definition wants to use the full
uname -r output, just adjust it accordingly.
> diff --git a/mk/buildlink3/imake-check b/mk/buildlink3/imake-check
> index c337d20..cc73165 100755
> --- a/mk/buildlink3/imake-check
> +++ b/mk/buildlink3/imake-check
> @@ -86,8 +86,8 @@ then
> fi
>
> # Run imake to process the Imakefile.
> -${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config -s - |
> -${IMAKE_MAKE} -f - builtin-test |
> +${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config
> +${IMAKE_MAKE} builtin-test |
> ${GREP} -q yes
> exitcode="$?"
>
I don't think this change is acceptable without a proper explanation
either.
> diff --git a/mk/fetch/sites.mk b/mk/fetch/sites.mk
> index 169f880..3315ffe 100644
> --- a/mk/fetch/sites.mk
> +++ b/mk/fetch/sites.mk
> @@ -465,3 +465,5 @@ MASTER_SITE_BACKUP?= \
> ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \
> http://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \
> ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/
> +
> +MASTER_SITE_MINIX=http://www.minix3.org/distfiles-minix/
What is it used for?
> diff --git a/mk/install/bin-install.mk b/mk/install/bin-install.mk
> index 0400f8f..60e3785 100644
> --- a/mk/install/bin-install.mk
> +++ b/mk/install/bin-install.mk
> @@ -32,6 +32,8 @@
> .if ${OPSYS} == "NetBSD"
> BINPKG_SITES?= \
> ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel}
> +.elif ${OPSYS} == "Minix"
> +BINPKG_SITES?= ftp://ftp.minix3.org/pub/minix/packages/$${rel}/$${arch}
> .elif ${OPSYS} == "DragonFly"
> BINPKG_SITES?= \
>
> http://mirror-master.dragonflybsd.org/packages/$${arch}/DragonFly-$${rel}/stable
See comment earlier.
Joerg
Home |
Main Index |
Thread Index |
Old Index