Date: 8 Jun 2000 02:01:23 +0200 From: naddy@mips.inka.de (Christian Weisgerber) To: freebsd-ports@freebsd.org Subject: Re: patches/ handling Message-ID: <8hmnoj$1loe$1@bigeye.mips.inka.de> References: <20000605184259.A21736@cichlids.cichlids.com> <20000607202517.D15229@cichlids.cichlids.com> <20000607134522.A353@FreeBSD.org> <20000607205859.A16247@cichlids.cichlids.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Alexander Langer <alex@big.endian.de> wrote:
> But I believe I'm talking against a wall or something:
>
> **********************************************************************
> * There is already the possibility of having a seperate arch/opsys *
> * patchdir.
Yes.
> I only change the behaviour of these to a way more useful way.
And that is subject to disagreement. As has been pointed out, this
"more useful way" reduces maintainability. It has also been argued, and
I agree, that the whole feature should just be removed.
> So if we really really really really have to use that seperate patchdir,
There is currently a single port, astro/xplanet, that makes use of
a patches.${ARCH} directory. And this port is an excellent example
of an abuse of this feature.
Any case that "requires" patches.${ARCH} will be *highly* exceptional.
We can handle it with a special rule in the port Makefile.
> So if not, you're going to provide a patch that completely removes the
> possibilty of having different patch dirs?
--- /usr/ports/Mk/bsd.port.mk Sun May 7 06:37:44 2000
+++ bsd.port.mk Thu Jun 8 01:56:50 2000
@@ -503,14 +503,6 @@
.include "${MASTERDIR}/../Makefile.inc"
.endif
-.if exists(${MASTERDIR}/Makefile.${ARCH}-${OPSYS})
-.include "${MASTERDIR}/Makefile.${ARCH}-${OPSYS}"
-.elif exists(${MASTERDIR}/Makefile.${OPSYS})
-.include "${MASTERDIR}/Makefile.${OPSYS}"
-.elif exists(${MASTERDIR}/Makefile.${ARCH})
-.include "${MASTERDIR}/Makefile.${ARCH}"
-.endif
-
.if exists(${MASTERDIR}/Makefile.local)
.include "${MASTERDIR}/Makefile.local"
.endif
@@ -528,11 +520,7 @@
# These need to be absolute since we don't know how deep in the ports
# tree we are and thus can't go relative. They can, of course, be overridden
# by individual Makefiles or local system make configuration.
-.if (${OPSYS} == "NetBSD")
-PORTSDIR?= /usr/opt
-.else
PORTSDIR?= /usr/ports
-.endif
LOCALBASE?= ${DESTDIR}/usr/local
X11BASE?= ${DESTDIR}/usr/X11R6
DISTDIR?= ${PORTSDIR}/distfiles
@@ -547,45 +535,10 @@
PACKAGES?= ${PORTSDIR}/packages
TEMPLATES?= ${PORTSDIR}/Templates
-.if exists(${MASTERDIR}/patches.${ARCH}-${OPSYS})
-PATCHDIR?= ${MASTERDIR}/patches.${ARCH}-${OPSYS}
-.elif exists(${MASTERDIR}/patches.${OPSYS})
-PATCHDIR?= ${MASTERDIR}/patches.${OPSYS}
-.elif exists(${MASTERDIR}/patches.${ARCH})
-PATCHDIR?= ${MASTERDIR}/patches.${ARCH}
-.else
PATCHDIR?= ${MASTERDIR}/patches
-.endif
-
-.if exists(${MASTERDIR}/scripts.${ARCH}-${OPSYS})
-SCRIPTDIR?= ${MASTERDIR}/scripts.${ARCH}-${OPSYS}
-.elif exists(${MASTERDIR}/scripts.${OPSYS})
-SCRIPTDIR?= ${MASTERDIR}/scripts.${OPSYS}
-.elif exists(${MASTERDIR}/scripts.${ARCH})
-SCRIPTDIR?= ${MASTERDIR}/scripts.${ARCH}
-.else
SCRIPTDIR?= ${MASTERDIR}/scripts
-.endif
-
-.if exists(${MASTERDIR}/files.${ARCH}-${OPSYS})
-FILESDIR?= ${MASTERDIR}/files.${ARCH}-${OPSYS}
-.elif exists(${MASTERDIR}/files.${OPSYS})
-FILESDIR?= ${MASTERDIR}/files.${OPSYS}
-.elif exists(${MASTERDIR}/files.${ARCH})
-FILESDIR?= ${MASTERDIR}/files.${ARCH}
-.else
FILESDIR?= ${MASTERDIR}/files
-.endif
-
-.if exists(${MASTERDIR}/pkg.${ARCH}-${OPSYS})
-PKGDIR?= ${MASTERDIR}/pkg.${ARCH}-${OPSYS}
-.elif exists(${MASTERDIR}/pkg.${OPSYS})
-PKGDIR?= ${MASTERDIR}/pkg.${OPSYS}
-.elif exists(${MASTERDIR}/pkg.${ARCH})
-PKGDIR?= ${MASTERDIR}/pkg.${ARCH}
-.else
PKGDIR?= ${MASTERDIR}/pkg
-.endif
.if defined(USE_IMAKE)
USE_X_PREFIX= yes
@@ -684,7 +637,7 @@
.endif
.endif
-.if defined(USE_IMAKE) && ${OPSYS} != OpenBSD && !defined(NO_INSTALL_MANPAGES)
+.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
MANCOMPRESSED?= yes
.else
MANCOMPRESSED?= no
--
Christian "naddy" Weisgerber naddy@mips.inka.de
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8hmnoj$1loe$1>