got spammed in the update to bsd.java.mk 2.0. They replace .BEGIN blocks
with check-makevars:: targets.
PR: 68516
Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
PLIST_SUB.
. Define java utility variables such as JAVA, JAVAC, JAVAH, APPLETVIEWER,
etc. conditionally (?=) rather than explicitly (=). This is in line with
both bsd.port.mk and the earlier version of bsd.java.mk.
Reviewed by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
* Don't assume root is using /bin/sh when switching credentials to
configure OPTIONS. [2]
* Support glob expressions in USE_GETTEXT to allow more flexibility
in the face of future gratuitous library version bumps by the gettext
developers [3]:
USE_GETTEXT=yEs # Works as before (case-insensitive)
USE_GETTEXT=[5-7] # Accepts any of those libintl.so.x versions
# in the LIB_DEPENDS
* Correctly register dependencies when a non-system perl port is used
on 4.x [4]
* Extend 'make search' support to allow much more flexible searching.
Syntax will be documented in CHANGES for brevity. [5]
* Reorder the post-install-script target to before add-plist-info for
consistency [6]
* Various fixes to support port operations when a port directory
exists under /usr/obj [7]
* Extend USE_PERL5_BUILD and USE_PERL5 to add EXTRACT and PATCH
dependencies since many ports require perl in those stages [8]
* Move info file deregistration later in the deinstallation process so
it works properly. [9]
* Improve wording in EXPIRATION_DATE message. [10]
* Fix dependencies for XFREE86_VERSION==3 (obtain imake from
x11/XFree86 now that the former port is gone) [11]
* While building index, treat non-existent dependencies as fatal.
Previously the error was being hidden by the stderr redirection. [12]
* Don't always retry BROKEN ports when package building (it is taking
too much time to continually rebuild ports that are usually going to
really be broken). Set TRYBROKEN if you want to attempt a build of
a BROKEN port. [12]
* Revert incorrect change from 1.487 relating to ALL-DEPENDS-LIST [13]
PR: 24214 [1], 67529 [2], 63937 [3], 65554 [4], 40699 [5],
59162 [6], 63372 66567 [7], 63394 [8], 65304 [9],
65931 [10], 66565 [11], 66743 [13]
Submitted by: roam [1], will [1], hrs [2], mi [3], ade [4],
Roman Neuhauser <roman@bellavista.cz> [5],
Sergey Matveychuk <sem@ciam.ru> [6], gad [7],
adamw [8], kris [8][12], dinoex [9],
Alexey Dokuchaev <danfe@regency.nsu.ru> [10],
eik [11][13]
. Added '-bootclasspath ${JAVA_CLASSES}' to the command-line for JAVAC when
jikes is used as a substitute for javac.
PR: 66349
Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
incarnation of ports/Mk/bsd.autotools.mk on the road to bringing
at least some semblance of sanity back to this corner of the
ports collection.
By far and away the easiest way to see the changes will be to
view the new file once committed, but here is a summary of the
changes:
1. USE_LIBTOOL, USE_AUTOCONF, USE_AUTOHEADER, USE_AUTOMAKE have
been fully deprecated. Ports attempting to use these variables
after the commit will error out, and most obviously break INDEX
generation, with a helpful error message. Instead, ports must
now specifically choose the version of any of these tools that
they need with the corresponding USE_*_VER variables. Note that
these variables understand any and all versions of autotools ports
in the tree, there is no longer a need to have specific version
numbers hardcoded in the infrastructure of bsd.autotools.mk
(as there is now). In particular, this will immediately open up
automake18 and autoconf259 for general use and beating.
2. Similarly for WANT_LIBTOOL, WANT_AUTOCONF, and WANT_AUTOMAKE.
Again, these have been fully deprecated, and the equivalent
WANT_*_VER versions should be used.
In order to preserve existing behavior for these variables, please
note the 20040314 entry in ports/CHANGES for the appropriate
version numbers to use for any ports in the GNATS queue.
Both WANT_* and USE_* bring in the relevant tool as a build
dependency, and set up a reasonably large number of variables
pointing to the right programs to be using in the port. The
only difference at the moment, is that USE_* will run an extra
autotools-related configuration step, whereas WANT_* merely
requests the environment.
3. The helper knob USE_LIBLTDL has been added which currently
simply adds a LIB dependency on the libltdl port.
4. Three new variables have been introduced,
WANT_{LIBTOOL,AUTOCONF,AUTOMAKE}_RUN=yes. These variables will
do nothing by themselves (a Work-In-Progress), but if the
appropriate autotool version is defined (either through
WANT_*_VER or USE_*_VER), this will add the relevant dependency
to RUN_DEPENDS.
Steps 3 and 4 now essentially negate the need for any kind of
direct dependency within a non-autotools port Makefile on
devel/autoconf*, devel/automake*, devel/libtool*, and devel/libltdl.
PR: 66037
Reviewed by: 4-exp bento cluster
http://gd.tuwien.ac.at/www.python.org/ -> 302
http://gd.tuwien.ac.at:8075/ they still have the mirror
(see ftp://gd.tuwien.ac.at/gds-mirrors.html#PYTHON), but
with a different structure, it breaks MASTER_SITE_SUBDIR,
so I'd just drop it.
PR: ports/67399
Submitted by: Roman Neuhauser <neuhauser@chello.cz>
MASTER_SITE_RINGSERVER is already listed:
ftp.nihon-u.ac.jp == ring.nihon-u.ac.jp
zoffy.asahi-net.or.jp = ring.asahi-net.org.jp
One should really configure MASTER_SITE_RINGSERVER if one wants to use
a specific server of RingServer.
* devel/libgsf is the old port minus gsf-gnome bits
* devel/libgsf-gnome contains libgsf-gnome-1 library and it's header files
This greatly reduces number of dependencies for ports that was using only
non-gnome part of this library.
- Point USE_GNOME parameter libgsf to GNOME-less port and create new parameter
libgsf_gnome for libgsf-gnome port.
- Convert all consumers of libgsf-gnome-1 library to depend on libgsf-gnome
port (read all as: Gnumeric)
PR: ports/63851 (in the spirit of)
Submitted by: Sybolt de Boer <sybolt@xs4all.nl>
Prodded by: lofi (KDE team)
Reviewed by: marcus (GNOME team)
Unless _NO_KDE_CONFTARGET_HACK is set, users of bsd.kde.mk
will automatically have
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} set.
This is necessary for almost every package using a configure script
created with non-historic versions of autoconf and really should be
handled in bsd.port.mk.
* Move the add-plist-info target after post-install, so that ports that
install their info files in the post-install phase will have them
correctly registered in the plist.
* all-depends-list was too aggressive: it should only include the
run-depends of the ports upon which it depends, plus the
non-runtime dependencies of the port itself. Previously it was also
including the non-runtime (e.g. BUILD, EXTRACT, FETCH) dependencies of
the ports upon which it depends, which are irrelevant.
line with bsd.port.mk and prevents errors when ${OSVERSION} is (somehow)
undefined.
Problem report from: Thomas Abthorpe <thomas@stthomas.stthomasanglican.org>
This is essentially a null-commit, with the one exception that
the "patch-libtool" target is now called "patch-autotools" for
consistency with "run-autotools".
Many thanks to kris for testing on the 4-exp bento cluster
Approved by: portmgr (kris)
Verified by: bento 4-exp
. Make the USE_JIKES setting to actually work.
. Simplified backwards compatibility with the old bsd.java.mk.
. Allowed java dependency selection with JAVA_PREFERRED_PORTS.
. More error checking on variable settings.
. Allowed USE_JAVA=yes to work without specifying a version.
. Expanded the meta-info for the individual ports so the full version
is now available, among other things.
Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
. Use the appropriate command variable (e.g. ${SED}) rather than the raw
command itself. Most of the files in Mk appear to do this, although
there are some exceptions. Certainly bsd.port.mk does.
The one exception is uniq, for which there isn't yet a defined variable.
PR: 65210
Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
bsd.java.mk now provides a new set of macros to be used by ports that
require a JDK. When USE_JAVA is set, the following variables may be set
in order to give to precision regarding the requirements of the port:
- JAVA_VERSION: A list of space-separated suitable java versions for the
port. An optional "+" allows you to specify a range of versions.
(allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+])
- JAVA_OS: A list of space-separated suitable JDK port operating systems
for the port. (allowed values: native linux)
- JAVA_VENDOR: A list of space-sperated suitable JDK port vendors for
the port. (allowed values: freebsd bsdjava sun ibm blackdown)
- JAVA_BUILD: When set, it means that the selected JDK port should be
added to build dependencies for the port.
- JAVA_RUN: This variable works exactly the same as JAVA_BUILD but
regarding run dependencies.
Here are some of the macros defined after setting USE_JAVA:
- JAVA_PORT: The name of the JDK port (e.g. java/jdk14)
- JAVA_HOME: The home of the JDK port in the local base
- JAVA_PORT_VERSION: The version of the JDK port.
- JAVA_PORT_OS: The operating system used by the JDK port.
- JAVA_PORT_VENDOR: The vendor of the JDK port.
- And many macros for the commonly used java executables, such as JAVA,
JAVAC, JAVADOC, JAVAH, RMID, JAR...
bsd.java.mk 2.0 is backward compatible with the previous version. Using
the new features is strongly encouraged, since the old bsd.java.mk 1.0
features will be deprecated and removed in the near future.
You will find more detailed info (as well as a quick tutorial) at:
http://www.esil.univ-mrs.fr/~hquiroz/freebsd/bsd.java.mk-2.0.html
If you experience any problems with java based ports that you believe
is due to this change then please let me know.
PR: 63511
Submitted by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
INFO_PATH variable may be used to specify their location. It defaults
to 'share/info' for the standard PREFIX, and 'info' when PREFIX ==
/usr. [1]
- Remove the <category>/pkg/COMMENT files in favour of a COMMENT
variable in <category>/Makefile [2]
- Prevent patch breakage with VERSION_CONTROL=numbered [3]
- Fix some instances of incorrect WRKDIRPREFIX handling. [4]
- remove useless ${MKDIR} ${WRKSRC} in config target [5]
- remove reference to OpenBSD [6]
- Exempt devel/p5-Module-Build from the self-dependency in
PERL_MODBUILD so that this port may use the option without getting an
infinite dependency list [7]
- The default PERL_ARCH is currently determined as a function of
OSVERSION. It should however be a function of PERL_LEVEL since the
correct value depends on what Perl version one has installed (older
Perl versions use ${ARCH}-freebsd, newer versions use mach). [8]
- Fix PORTDOCS on older (4.7, 5.0) systems [9]
- Allow 'make parallel' to generate a working makefile when not all
categories are present (this does not mean you'll be able to build all
ports, unless you make sure they don't have external dependencies) [10]
- Don't report symlinks as world-writable in the security check [11]
- Fix a comment that was broken by a mismerged patch [12]
- Clarify the meaning of USE_*, WANT_*, WITH_* and WITHOUT_* [13]
- Don't set _CHKSUMFILES/_IGNOREFILES if CKSUMFILES/IGNOREFILES is
empty and DIST_SUBDIR is set. [14]
- Fix comment for DISTDIR [15]
- Update the documentation of the USE_GL variable [16]
- Check to see if NONEXISTENT exists, and fail with an error if it does [17]
- Fix fetching of new distfiles in 'make makesum' when SIZE is set [18]
- Consistently set MAKE_ENV when USE_GCC=3.2 or 3.3 are set [19]
- Rework INDEX builds: [20]
* Fix the bsd.port.subdir.mk code that is supposed to report index
breakage (the fallback code wasn't actually being run because make
would halt immediately following the error). This should help with
INDEX error reports because it will immediately show the cause of
failure, so we won't have to pull teeth to extract it from the
submitter.
* Streamline the 'make describe' code a bit.
* Provide some basic instructions to the user when an index build
fails, on when and how to report index build failures (turn this off
with INDEX_QUIET=1)
* Removed INDEX_NOSORT, because I couldn't imagine it to be very
useful and it doesn't cost very much anyway.
* Don't prevent INDEX builds from seeing the local host environment.
Since a lot of users are using 'make index' thesedays they should get
an index that reflects their local settings and installed ports. If
you want to build a 'default' index that isn't influenced by local
settings (e.g. for release builds), set the INDEX_PRISTINE variable.
* Allows parallel INDEX builds (using make -j). The most obvious way
of doing this doesn't work, because I/O from child makes is broken up
into 2k chunks, and output lines from 'make describe' that exceed this
length (*cough* GNOME *cough*) will be intertwined with the output of
other makes, leading to a corrupted INDEX. The I/O interleaving
can be disabled using 'make -P', but this inserts extraneous output of
its own, and redirects stderr, making it useless for our purposes.
Instead, I collect the output from the child make processes in
temporary files and recombine them at the end.
* The number of concurrent make processes to spawn can be set using
INDEX_JOBS. By default this is set to 2, which seems to be a sweet
spot for both single and dual-processor systems. On my tests I do not
see any significant performance changes on UP, but on a dual 4.x
system the build time drops by 47% (6 minute index builds on one test
machine!). Depending on your disk and CPU hardware you might see
further gains with INDEX_JOBS=4 or higher, so you might like to
experiment to see what works best. On a dual 5.x system the
performance gains do not seem to be as great (20-30%), but this is
still a significant net win.
PR: 55493 [1], 59651 [2], 61552 [3], 62247 [4], 62329 [5],
62337 [6], 62422 [7], 62441 [8], 62627 [9], 62983 [10],
63112 [11], 63297 [12], 63335 [13], 64029 [14], 64069 [15],
64236 [16], 64519 [17], 62958 [18], 64237 [19]
Submitted by: lev [1],
Matthew Seaman <m.seaman@infracaninophile.co.uk> [2],
Joel Ray Holveck <joelh@piquan.org> [3],
ade [4], Sergey Matveychuk <sem@ciam.ru> [5],
markus [6], mat [7], des [8], eik [9],
Dmitry Morozovsky <marck@rinet.ru> [10],
Andrew <andrew@ugh.net.au> [11], vs [12], linimon [13],
edwin [14][15], gerald [16], marcus[17][18], kris [19][20]
not permit passive FTP, and
<URL:http://www2.auckland.ac.nz/net/Accounting/> asks that we only
download from it "at any time between 0700 and 2000 GMT (traffic
charges to New Zealand - which we pay - are cheaper between 8 pm
and 9 am)."
- upgrade to 1.2.7
- add a knob WITH_NAS
- fix dependences to aalib & svgalib
- use standard DOCSDIR & EXAMPLESDIR
- fix plist for NOPORTDOCS
- distribute README-SDL.txt.
PR: Based on ports/57475
Submitted by: Thierry Thomas <thierry@pompo.net>
Reviewed by: kris@ with a build on bento
Important changes:
==================
KDE:
- Audio/arts does not install artswrapper anymore, instead it is provided by
audio/artswrapper. See UPDATING.
- misc/kdeaddons3 is now a metaport with
editors/kate-plugins
editors/vimpart
games/atlantikdesigner
misc/kaddressbook-plugins
misc/kfile-plugins
misc/kicker-applets
misc/knewsticker-scripts
misc/konq-plugins
misc/ksig
misc/renamedlgplugins
multimedia/noatun-plugins
net/kontact-plugins
as slave ports.
- A number of KDE ports now uses OPTIONS do make various WITH_* options more
visible.
- Plist fixes
- devel/kdevelop should be able to detect FreeBSD's autoconf/automake now for
newly created projects.
- kdebase will no longer remove previous KDM configurations. This won't take
effect during the update from 3.2.0 to 3.2.1 (as deinstalling 3.2.0 will still
remove the configuration), but subsequent updates will merge old configs.
QT:
- Previous versions of QT could be compiled with debugging-support enabled by
defining DEBUG. This switch has been renamed to the more unambiguous
WANT_QT_DEBUG (similar to WANT_KDE_DEBUG in the KDE ports).
- remove belnet from the list until the distfiles are fixed
rationale:
- separately listed mirrors make the distfile survey more reliable,
and we can remove sites with problems, even though it is bad for
automatic sorting
try the following sh scripts:
for m in heanet aleron unc belnet umn twtelecom switch easynews keihanna cesnet; \
do echo -n $m ": "; fetch -o - -q -A http://$m.dl.sourceforge.net/sourceforge/balance/balance-3.11.tar.gz | md5; done
for m in heanet aleron unc belnet umn twtelecom switch easynews keihanna cesnet; \
do echo -n $m ": "; fetch -o - -q -A http://$m.dl.sourceforge.net/sourceforge/gaim/gaim-0.75.tar.bz2 | md5; done
Always put a version suffix to the ruby name (no matter if ruby is the
default version) to avoid mess in future.
[Notes for i386 users]
If you are a ruby developer and still want to stick with ruby 1.6 as
default, please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.
If you are a ruby developer and want to keep ruby 1.6 as default,
please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf. Otherwise, please
run the following series of commands to migrate to ruby 1.8:
1) Reinstall portupgrade manually (and ruby 1.8 will be installed)
pkg_delete portupgrade-\*
(cd /usr/ports/sysutils/portupgrade; make install clean)
2) Reinstall everything that depends on ruby 1.6 (to use ruby 1.8)
portupgrade -fr lang/ruby16
3) Reinstall ruby 1.8 (because the previous step kills symlinks)
portupgrade -f lang/ruby18
4) Deinstall ruby 1.6 stuff (if you are paranoia)
pkg_deinstall -ri lang/ruby16
