both current (fc4) and future linux (f8) distributions at one
ports tree.
The patch contains full changes to ports/Mk files and all ports involved.
But only infrastructure is changed. The resulting packages are the same as
before. Hence no need to bump PORTREVISIONs.
The idea was taken from bsd.gnome.mk and others.
More than 130 ports are switched to follow a new linux infrastructure
introduced by changes to bsd.port.mk, bsd.linux-rpm.mk and a new
bsd.linux-apps.mk.
Thanks for all who was involved and helped me with this work.
And help from Alexander Leidinger was incredible.
Other changes are coming. Stay tuned!
PR: ports/132510
Submitted by: bsam (me)
Exp-run by: portmgr (pav)
base ports were unified. Now it's linux_base-fc4 turn: devel/linux-glib2
is incorporated.
Changes:
* emulation/linux_base-fc4:
. devel/linux-glib2 is incorporated;
. CONFLICTS is fixed;
. PORTREVISION is bumped;
* removed *_DEPENDS upon devel/linux-glib2 and PORTREVISION bumped:
. accessibility/linux-atk;
. astro/google-earth;
. audio/linux-openal;
. graphics/linux-XnViewMP;
. www/linux-mplayer-plugin;
. x11-toolkits/linux-gtk2;
. x11-toolkits/linux-pango;
* devel/linux-glib2:
. CONFLICTS is fixed;
. DEPRECATED;
. EXPIRATION_DATE is set;
Note: this should fix a bug for non-default linux base ports when glib2
files were installed both by a linux base and by linux-glib2 ports.
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
- use fixed plists [1]
- category "linux" added to those ports without it [1]
- update some ports to a recent FC3 one [1]
- remove plists/... for Alpha (there's no support since linux_base-8 for
Alpha anymore)
- don't hardcode version numbers in some plists, use PLIST_SUB instead
(any errors are mine, don't keep them, send them to me)
Regarding linux-ungif I declare a maintainer timeout (one month, Boris tried
to contact the maintainer) and also pull the "sweeping commit"-card (the
port which it uses as some kind of master port can not be used for this
anymore). Besides this, I don't think he will be upset when other people
do the work instead of adding an entry to his TODO list. :-)
This commit brings us just before the switch of the default linux base
port to the fc3 one, modulo some bugs which may appear. So:
Beta testers wanted!
To test:
sed -i.old -e 's:linux-XFree86-libs:linux-xorg-libs:' /usr/ports/Mk/bsd.port.mk
echo OVERRIDE_LINUX_BASE_PORT=fc3 >> /etc/make.conf
portupgrade -f -o emulators/linux_base-fc3 -f linux_base-8
portupgrade -o x11/linux-xorg-libs linux-XFree86-libs
portupgrade linux-\*
The first two steps are necessary to switch to fc3 as the new default linux
base port, the last 3 steps to upgrade to fc3.
And feel free to send a big "Thank you!" to Boris, he did a lot of the work!
I just provided some hints and answered some questions (besides from
committing all the necessary changes for FC3 and doing some minor
changes+comments/improvements to/of his work), even when he tries to tell
you something else. ;-)
Submitted by: Boris Samorodov <bsam@ipt.ru> [1]
- USE_LINUX now implies NO_FILTER_SHLIBS=yes. It also doesn't use FreeBSD
tools to strip binaries anymore, so it's not neccesary anymore to override
STRIP and STRIP_CMD.
- USE_LINUX_PREFIX implies NO_MTREE now.
- In the USE_LINUX case, USE_XLIB now depends upon the linux X11 libraries
instead upon the native FreeBSD libraries.
- The variable LINUX_BASE_PORT contains a string which is suitable as an
item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the
default (or overriden) linux base, ${LINUX_BASE_PORT} should be used
instead of a hardcoded reference.
- Change all ports to comply to the "new world order".
- The Ports Collection now allows to override the default linux_base port.
Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
- If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base
port and if USE_LINUX isn't set to "yes" (case insensitive), the port will
be marked as IGNORE. [1]
- Readd USE_LINUX knobs into several ports and make several uses of a
conditional dependency ("USE_LINUX?=") into an unconditional one
("USE_LINUX=") which where removed/changed by Trevor to allow the use of
alternative linux_base ports. While this is a nice goal, the implementation
resulted in missing dependencies. The OVERRIDE_LINUX_BASE_PORT knob
in this commit is supposed to fix the problem while keeping the feature.
Basicaly this includes a backout of Trevor's commit, to prevent confusion
I mention it here explicitely.
- Use the correct prefix (X11- instead of LOCAL- or LINUX-) for some ports.
Chase dependencies for this.
- Changes to make linux_devtools installable on amd64, remove some stray
device nodes (they don't work on recent OS versions and aren't really
needed).
- Make linux_base-8 PREFIX clean and remove some stray device nodes.
Additionally tell a little bit more about how to setup NIS/YP [2].
- Update the PGSQL dependency in the linux-opengroupware port to a recent
version (the old one isn't available anymore), I don't know if this
works (at least it isn't more broken than before).
- Use PREFIX/usr/share/doc instead of PREFIX/usr/doc in the divx4linux
ports, the former path exists already and gets populated by other
packages too (PREFIX=LINUXPREFIX!).
- Fix some obvious (non-linuxolator) bugs in some linux ports while being
there.
- Bump PORTREVISION where neccesary.
Requested by: portmgr (linimon) [1]
Submittted by: Gerrit Kuehn <gerrit_huehn@gruft.fido.de [2]
Approved by: portmgr (kris, linimon), maintainers (or maintainer timeout)
Tested on: ports cluster (kris)
Reviewed by: silence on emulation@
Superseedes PR: 69997
Maintainer approval from:
chris@chrisburkert.decracauer@cons.org
des
girgen
jamie@bishopston.net
mezz
mi
nivit@users.sf.net
pat
simond@irrelevant.orgriggs@rrr.deUdo.Schweigert@Siemens.com
Gtk+ is under the GNU Library General Public License. The following
is the portion of the license which grants permission to distribute
it in binary form:
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable
form under the terms of Sections 1 and 2 above provided that you
accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of
Sections 1 and 2 above on a medium customarily used for software
interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy
the source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
Since this port does not offer the sources, the conditions are not
satisfied, and therefore the license does not give us permission
to distribute the binaries.
I brought up this issue with portmgr but after 73 days I have seen
no response.
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
gdk-pixbuf-query-loaders;
- Generates gtk.immodules in post-install rather than shipping it with
the port;
- Generates gdk-pixbuf.loaders.
PR: ports/68133
Submitted by: Jean-Yves Lefort
Approved by: maintainer time-out.
script was renamed to solve a conflict with archivers/rpm) to fix possible
build problems.
I've tested this with lang/icc. Any new errors because of this commit in
one of the modified ports may be because the ports previously may have used
rpm2cpio from archivers/rpm instead of the used {EXTRACT,BUILD}_DEPENDS
archivers/rpm2cpio.
