diff options
author | netchild <netchild@FreeBSD.org> | 2004-12-31 18:24:10 +0000 |
---|---|---|
committer | netchild <netchild@FreeBSD.org> | 2004-12-31 18:24:10 +0000 |
commit | 41aa99b87f1fc1de75ee54ee38b4782ee393704b (patch) | |
tree | 377e4c9c9dd556f0b4785f3df7b930015778713f /editors | |
parent | 0a7250c8120524f20b14e530af6f7eddf2e77d1e (diff) | |
download | FreeBSD-ports-41aa99b87f1fc1de75ee54ee38b4782ee393704b.zip FreeBSD-ports-41aa99b87f1fc1de75ee54ee38b4782ee393704b.tar.gz |
Say hello to the linux mega patch, it consolidates our linux bits a
little bit and allows to proceed to a more recent linux_base from
a stable (read as: the major bugs should be ironed out or identified
and most linux ports build just fine) source.
It also allows to ship 4.11 with a working linuxolator (the EOLed
linux_base is marked forbidden because of a security hole).
This is a major update, please read UPDATING (and CHANGES if you
develop linux ports).
Changes:
- change the default linux_base from v7 to v8
- add a newer freetype to linux_base-8 for nicer fonts display [1]
- don't let cpio use hardlinks in the linux_base-8 port to quiet some
warnings in some cases [2]
- fix a cut&past error in the linux_base-8 pkg-install script [3]
- convert the binary knob "USE_LINUX" to a version specifier, e.g.
USE_LINUX=<value> specifies a dependency upon
emulators/linux_base-<value>, exceptions are a value of "7" (which
does what you want and adds a dependency to linux_base) and any
value without a corresponding port in
PORTSDIR/emulators/linux_base-<value> (which adds a dependency to
the default linux_base)
- don't implicitly add USE_LINUX with the USE_LINUX_PREFIX knob,
this allows us to use the USE_LINUX_PREFIX knob for linux_base and
paves the way for splitting up future linux base ports into
individual pieces
- remove RESTRICTED from some GPL licensed ports, even when we only
distribute binaries, we get them from official linux sites, so
anyone can grab them there if he needs to
- add a dependency upon the linux X11 bits where necessary (based upon
guesswork)
- don't use USE_X_PREFIX in some linux ports since it adds a dependency
to the FreeBSD X11 libs, as a workaround use PREFIX?= (the clean
solution would be to remove the implicit USE_XLIB from USE_X_PREFIX)
- bump the portrevision of the linux ports ("better safe than sorry"
algorithm)
- pass maintainership of the important linux infrastructure to a
mailinglist, hijack freebsd-emulation@ for this purpose (if somebody
doesn't like this: tell us your bikeshed color at freebsd-emulation@,
my color would be "linuxolator@" in case someone cares...)
- add a pkg-install script for linux-fontconfig, but don't use it;
everything should work without it (the FreeBSD fc-cache program should
do all the work), but in case we need it we just need to decomment the
pkg-install part in the Makefile
- fix some dependencies
- fix some bugs
- add some static plists
- unbreak the ports with dependecies to more than one linux_base
This also fixes some ports which are marked BROKEN because of dependencies
to v7 and v8 of linux_base at the same time.
Known bugs:
- the linux-mesa and linux-devtools ports install libGL*.so symlinks
- some "minor" plist bugs (e.g. ld.so.{conf,cache} are modified by
the linux X11 port, so linx_Base-8 moans at deinstall time)
Future work (interested souls should coordinate with freebsd-emulation@):
- add some kind of USE_LINUX_X11 knob to streamline the X11 dependencies,
or modify the behavior of USE_XLIB in the USE_LINUX case
AFAIK trevor has some patches.
- make USE_XLIB and USE_X_PREFIX orthogonal to be able to get rid of
the PREFIX?= workaround in some linux ports
Should be discussed/coordinated on/with x11@.
- move the RPM bits from x11-toolkits/linux-gtk/Makefile to PORTSDIR/Mk/
- update to a more recent linux base
PR: 69997, 70539 (and maybe others)
Discussed with/on: java@, x11@, trevor, portmgr
Tested by: mezz, portmgr, pointyhat
RPM hunted down by: Joseph Gelinas <scirocco@tasam.com> [1]
Requested by: portmgr [2]
Submitted by: kris [3]
Approved by: portmgr
Diffstat (limited to 'editors')
-rw-r--r-- | editors/edith/Makefile | 3 | ||||
-rw-r--r-- | editors/staroffice5/Makefile | 2 | ||||
-rw-r--r-- | editors/staroffice52/Makefile | 6 | ||||
-rw-r--r-- | editors/staroffice60/Makefile | 4 | ||||
-rw-r--r-- | editors/staroffice70/Makefile | 4 |
5 files changed, 15 insertions, 4 deletions
diff --git a/editors/edith/Makefile b/editors/edith/Makefile index fa7d11b..2ea8df8 100644 --- a/editors/edith/Makefile +++ b/editors/edith/Makefile @@ -7,6 +7,7 @@ PORTNAME= edith PORTVERSION= 1.58 +PORTREVISION= 1 CATEGORIES= editors linux MASTER_SITES= ftp://ftp.eidetica.com/pub/edith/x11/ DISTFILES= edith1.55.common.tar.gz \ @@ -15,6 +16,8 @@ DISTFILES= edith1.55.common.tar.gz \ MAINTAINER= ports@FreeBSD.org COMMENT= A X11 GUI editor for binary and plain text files +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs + USE_LINUX= yes USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile index e1aad4b..d82efc9 100644 --- a/editors/staroffice5/Makefile +++ b/editors/staroffice5/Makefile @@ -7,6 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.1a +PORTREVISION= 1 CATEGORIES= editors linux MASTER_SITES= http://afug.hypermart.net/files/ \ ftp://ftp.stat.duke.edu/pub/Users/sto/StarOffice51a/ @@ -18,6 +19,7 @@ MAINTAINER= mb@imp.ch COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index e21a418..750ab2c 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors linux MASTER_SITES= ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/staroffice52/ \ ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \ @@ -32,8 +32,10 @@ EXTRACT_ONLY= 109939-03.tar.Z MAINTAINER= mbr@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base +FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +USE_LINUX= yes NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be downloaded direct from Sun via www interface' diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index bb1eb85..d8c6197 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors linux MASTER_SITES= ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \ ftp://ftp.math.ohio-state.edu/private/sun/.../:patch \ @@ -26,6 +26,8 @@ EXTRACT_ONLY= 112887-04.tar MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs + NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index d784b11..a55d87b 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 7.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors linux MASTER_SITES= ftp://patches.sun.com/patchroot/all_unsigned/:patch \ ftp://ftp.sun.co.uk/pub/patches/:patch \ @@ -30,6 +30,8 @@ EXTRACT_ONLY= 116518-06.tar MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart +RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs + ONLY_FOR_ARCHS= i386 NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface' |