- bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}*
- Cleanup corresponding ports for bsd.kde.mk update.
- Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom,
introduce QT_NONSTANDARD variable for nonstandard configure setup.
- Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the
proxy authentication that was broken for 2.1.1. Remove old patches.
- Potentially fix kdelibs build for alpha.
- Fix qt-designer 2.3.0 build.
- Ruby stuff left alone since it looks like black magic to me. Should
still work w/ compat shims for older USE_QT[,2] style. Some others
were also left alone for the same reason.
Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk)
Submitted by: David Faure <faure@kde.org> (proxy auth patches)
Alex Zepeda <garbanzo@kde.org> (old patches removal)
an alias of a small group of people who agreed to take care of this file.
(2) USE_QT2 now depends on qt23, not qt22, which will be deleted shortly.
(3) Add new variables PTHREAD_CFLAGS and PTHREAD_LIBS to help the transition
with the new pthread linking scheme.
Submitted by: sobomax
(4) Add new categories science and ukrainian.
PR: 23313 (ukrainian)
Submitted by: reg
PR: 24525
Approved by: obrien
(2) Change XFree86 version in PKG_IGNORE_DEPENDS
Submitted by: olgeni
(3) Change message for "old layout" error to include a pointer to the
cvsup FAQ.
Submitted by: kris
Submitted by: sobomax
(2) Add new variable NO_OPENMOTIF that will disable dependency to
open-motif (when USE_MOTIF is defined, of course). Use this if
you want to make sure your commercial Motif won't get wiped out.
Submitted by: obrien
(3) Add NOPORTDOCS support to PLIST_SUB. When NOPORTDOCS is defined,
PORTDOCS="@comment " will be added to PLIST_SUB.
Prodded by: steve
audio/libao, audio/libogg, audio/libvorbis and audio/vorbis-tools
which need --add-missing to be passed to automake.
PR: 22610
Submitted by: Theo van Klaveren <t.vanklaveren@student.utwente.nl>, roger, sobomax
USE_MOTIF and generates a LIB_DEPENDS to x11-toolkits/open-motif. As
before, it implies USE_XPM (and therefore USE_XLIB). Motif-dummy is
removed from PKG_IGNORE_DEPENDS, whose sole resident is now XFree86-3.
Most of the simple ".if defined(HAVE_MOTIF)"s are removed to always
have USE_MOTIF. ftp/moxftp will define USE_MOTIF unless
WANT_ATHENA_VERSION (new variable) is defined. I merged the X cases
in cad/mars, so USE_MOTIF is used iff WITHOUT_X11 is not defined.
I will remove x11-toolkits/Motif-dummy (which has been repo copied to
open-motif) in a few days.
can be used in != constructs in port Makefiles. Use them in ARCH,
OPSYS and OSREL defenitions.
(2) Change a few more `md5' references to `distinfo'.
PR: 22154
Submitted by: jeh
(3) Bump XFree86-3 version (twice!) in PKG_IGNORE_DEPENDS.
place in checksum message, etc.)
Partially submitted by: Bill "distfiles" Fenner
(2) Add PATCH_WRKSRC, BUILD_WRKSRC and INSTALL_WRKSRC alongside
CONFIGURE_WRKSRC to deal with oddball ports that want different
directories. They all default to WRKSRC (of course). Also extend
the use of CONFIGURE_WRKSRC to include all configure-related
activities.
Originally submitted by: obrien
Reviewed by: the ports list
(3) Clarify in comment that CONFIGURE_SCRIPT is supposed to be a
relative path. Add a "./" in the PERL_CONFIGURE case to be
consistent with the regular case.
Requested by: obrien
(4) Change PKG_IGNORE_DEPENDS yet again to chase XFree86-3
PORTREVISION change.
(5) Don't print "Ignoring empty patch directory" when there are no
files named "patch-*" -- since PATCHDIR is now equal to FILESDIR
by default, it is quite likely that you will have a directory with
no patch-* files in it.
Noticed by: kris
(6) Fix distclean target, which I broke in 1.353 when I introduced
RESTRICTED_FILES. It was only deleting files for RESTRICTED or
NO_CDROM ports (duh!).
(7) Don't complain if ${DISTDIR}/${DIST_SUBDIR} is empty when deleting
distfiles -- it can be shared among ports.
Submitted by: steve
(8) Don't create ${FILESDIR} in makesum target, since distinfo now
lives in the main directory.
Submitted by: knu and many others
in bsd.port.mk to support it.
In particular, bsd.port.mk includes bsd.gnome.mk twice (once in the
pre.mk section, once in the post.mk section) and prints out a message
notifying the user of the existence of WITH_* options when one exists.
It also adds MAKE=${GMAKE} to CONFIGURE_ENV when USE_GMAKE is defined.
(This is not related to gnome, but I assume it's useful somewhere and
it shouldn't hurt.)
Submitted by: ade, reg
patches/. In addition, patches live in files/ and files/md5 is
moved to "distinfo" in main directory.
It is disabled by default, but you can test it by defining
NEWLAYOUT. I will convert the entire ports tree in a week and
make NEWLAYOUT the default.
Reviewed by: the ports list
Submitted by: nectar ("distinfo" name)
(2) Bump XFree86 version number in PKG_IGNORE_DEPENDS.
(3) New variable RESTRICTED_FILES to be used when only a subset of a
RESTRICTED or NO_CDROM port's distfiles/patchfiles list is not
redistributable. (Set RESTRICTED_FILES to the list of
redistribution-challenged files.)
Reviewed by: the ports list
Submitted by: kris
(2) Include bsd.ruby.mk if USE_RUBY and USE_LIBRUBY are defined.
Submitted by: ruby-czar knu
(3) USE_QT2 now uses qt22 instead of qt21.
Submitted by: will
(4) Typo: RUN_DEPENDS= -> RUN_DEPENDS+= in USE_LINUX.
Submitted by: Kazu TAKAMUNE <takamune@avrl.mei.co.jp>
(5) Add ${MTEE_FOLLOWS_SYMLINKS} to mtree arg. This is either "-L" or
undefined, so it will only change the behavior when mtree actually
has support for the flag.
Submitted by: ache
(6) Change nesting of .ifs around MOTIF_OPEN -- it used to be inside
PARALLEL_PACKAGE_BUILD. I don't know what I was smoking.
(7) Add new category french. Now the French have the same thing the
Germans have had for a while. :)
Requested by: Martin Blapp <mb@imp.ch>
(8) Add new virtual category zope.
Requested by: Neil Blakey-Milner <nbm@mithrandr.moria.org>
in the log.)
Print oun out a warning when there is a setuid/gid program or a
startup script installed.
Submitted by: kris
(1') Print out directory correctly by substituting ${PREFIX} properly.
Submitted by: knu
(2) Now variable PERL_CONFIGURE, which runs Perl's Makefile.PL.
PR: 19241
Submitted by: Christian Weisgerber <naddy@unix-ag.uni-kl.de>
Reviewed by: markm, ache
(3) Print out distinctive message when forcefully trying BROKEN ports
on parallel build cluster. This is used by the errorlog parser to
put a tag for BROKEN ports.
Requested by: ade
(4) Print out name of failed patch plus all the applied patches when
there is a patch failure.
Submitted by: sobomax
Reviewed by: the ports list
(5) Insert a few more "cd ${.CURDIR}"s so things will work even if
/usr/obj${.CURDIR} exists.
Reviewed by: the ports list
(6) Make implementation of XFREE86_HTML_MAN a little more streamlined.
Reviewed by: the ports list
Reviewed by: the ports list
(1) Add PORTREVISION and PORTEPOCH, which are both optional, to
PKGNAME. PKGNAME is now defined as
${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}[_${PORTREVISION}][,${PORTEPOCH}]
PORTREVISION denotes some FreeBSD internal change to the port that
requires the user to upgrade it. A security fix or a shared
library version change will be valid reasons to change (or define)
PORTREVISION.
PORTEPOCH is used to re-sort versions that is screwed up by the
author. PORTEPOCH is sorted before all other fields for the
purpose of determining which version is newer than the other.
Submitted by: kris
(2) Add fetch-recursive and fetch-recursive-list. These are like
fetch and fetch-list but they also descend into dependencies.
While I'm here, clean up some internal target names and comments.
Requested by PR: 12548
(2') Fix bug in fetch-list I introduced in rev 1.347.
(3) Add new variables LINUXBASE, USE_LINUX and USE_LINUX_PREFIX.
LINUXBASE defaults to /compat/linux and will be the default PREFIX
if USE_LINUX_PREFIX is defined. USE_LINUX, which is also implied
by USE_LINUX_PREFIX, will add a runtime dependency to the
emulators/linux_base port.
Approved by: marcel
(4) Include bsd.python.mk when USE_PYTHON and PYTHON_VERSION are defined.
Submitted by: tg
(5a) Change USE_FREETYPE to always depend on print/freetype -- it
turns out that XFree86-4-libraries only used freetype internally
and didn't install the libraries nor headers.
Submitted by: Taguchi-san (XFree86-4-* maintainer)
(5b) Change USE_MESA to lib-depend on GLU.1:graphics/Mesa3 when
XFREE86_VERSION=4. The Mesa port has been changed to only
install components missing from the XFree86 distribution when
XF8V=4.
Submitted by: sobomax
(5c) New variable XFREE86_HTML_MAN, which defaults to "no" when XF8V=3
or USE_IMAKE is not defined, and "yes" when XF8V=4 and USE_IMAKE
is defined. When this variable's value is "yes", generate-plist
will add html-ified manpages to the generated PLIST.
Approved by: Taguchi-san
(6) Allow user to override MD5_FILE.
Requested by: many
(7) Small message change: "...doesn't seem to exist on this system" ->
"... to exist in ${_DISTDIR}".
Requested by: some mail in the mailing lists...can't remember which ;)
be used inside Makefiles for testing.
Submitted by: sobomax
(2) Use newly added /etc/mtree/BSD.x11-4.dist when XFREE86_VERSION=4.
Requested by: taguchi@tohoku.iij.ad.jp
(3) Re-enable MASTER_SITE_OVERRIDE and MASTER_SITE_BACKUP
functionalities by making MASTER_SORT ignore them (i.e., leave
*_OVERRIDE at the beginning and *_BACKUP at the end). As a side
effect, there are new targets "master-sites" and "patch-sites"
that will print out the correctly sorted versions of said lists.
Reviewed by: the ports list
(3') Sort patch sites too, not only master sites.
Reviewed by: the ports list
(4) New target "deinstall-depends" which will do a "make deinstall" in
all ports this one depends on.
(4') Only run pkg_delete from the deinstall target when package
exists, to avoid "no such package installed" errors.
REQUIRES_MOTIF case, so it won't picking up unneeded xpm
dependencies when XFree86-4 is being used.
(2) New variable MOTIF_OPEN which depends to x11-toolkits/open-motif
instead of commercial variants. This is for testing only -- I
intend to replace the whole Motif hackery with a normal dependency
to open-motif when it is proved sufficient.
(3) Fix typo in XAWVER, I had the XFree86-3 and 4 cases backwards.
Submitted by: steve
(4) Add BUILD_DEPENDS to devel/imake-4 when USE_IMAKE is set and
XFREE86_VERSION=4. Otherwise ports won't be able to find imake.
Reported by: alex, among others
(5) Make USE_XPM, USE_DGS, USE_MESA and USE_FREETYPE imply USE_XLIB
when XFREE86_VERSION=4. Otherwise some ports can't find them.
(6) Add new target "pre-everything" that is called before fetch. Use
this (instead of pre-fetch or .BEGIN) if you want something to be
done before one of the normal targets are run. Switch perl
version check to use pre-everything, otherwise you can't even
build a 5-current index on a 4-stable machine (for instance).
(7) Add "ruby" to list of valid categories.
Requested by: knu
XFree86 (3 or 4) to depend to when USE_XLIB is set.
XFREE86_VERSION defaults to 3 for now, but adventurous users can
override it in /etc/make.conf. When XFREE86_VERSION=3, USE_XLIB
will add a dependency to x11/XFree86; when it is set to 4, the
dependency will be to x11/XFree86-4-libraries. When
XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS and ALWAYS_BUILD_DEPENDS
hacks to avoid messing with XFree86 are turned off.
Since XFree86 version 4 includes some software that used to be
separate ports, when XFREE86_VERSION=3 the following variables are
provided:
USE_DGS LIB_DEPENDS on x11/dgs
USE_FREETYPE LIB_DEPENDS on print/freetype
USE_MESA LIB_DEPENDS on graphics/Mesa3
USE_XPM LIB_DEPENDS on graphics/xpm
When XFREE86_VERSION=4, these variables have no effect. The
LIB_DEPENDS in the tree for the above four ports have all been
converted to the USE_* counterparts. For your information, this
is the count of the number of ports:
USE_DGS 0
USE_FREETYPE 16
USE_MESA 36
USE_XPM 236
There is a new variable, XAWVER, which is set to 6 when
XFREE86_VERSION=3 and 7 when XFREE86_VERSION=4. This is also
passed to PLIST_SUB so ports that build Xaw based shared libraries
can use this variable to substitute the shlib version number.
There is also a provision of using a separate mtree file for
XFREE86_VERSION=4, but that part is not enabled yet.
Reviewed by: the ports list
Tested by: make index (XFREE86_VERSION=3 only)
(2) Add hebrew to list of valid categories.
Submitted by: nbm
MASTER_SORT="foo.bar.co.jp bar.co.jp .jp" bsd.port.mk will try the
machine foo.bar.co.jp, then any machine in the domain bar.co.jp,
then any machine in the domain .jp. It might be useful for people
in an island (network-topologically speaking).
Submitted by: knu
Obtained from: NetBSD
(2) Deal with mtree's changing flags by looking at ${OSVERSION}
Submitted by: ache
(3) Don't generate code to try to erase an empty info/dir file if
NO_MTREE is set -- although it will probably never happen that
/usr/share/info/dir will be empty, it's still wasted code.
Submitted by: markm (and many others)
(2) Move one PLIST_SUB line from the pre.mk section to post.mk section
so it won't cause unwanted side effects.
Spotted by: sobomax
previous commit message to bsd.port.mk, which said INSTALL_SHLIBS. Boo.)
Line up the rhs of variable assignments nicely. Remove a couple of extra
whitespaces while I'm here.
Suggested by: sobomax
INSTALL_SHLIBS is set, ldconfig is automatically called from
post-install and necessary @exec and @unexec lines are added to
PLIST.
Requested by: lioux@uol.com.br
Reviewed by: the ports list, in particular sobomax
(1a) Add
PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
to PLIST_SUB. These are needed by INSTALL_SHLIBS, but also could
be useful in general.
(2) Move master/mirror site definitions to bsd.sites.mk and include it
from bsd.port.mk. Open bsd.sites.mk to other committers.
Submitted by: reg
(2a) Add MASTER_SITE_SOURCEFORGE.
Submitted by: sobomax (who wrote SORCEFORGE, but I assume that's a typo :)
(2b) Move MASTER_SITE_LOCAL from ".../ports/distfiles/LOCAL_PORTS/" to
".../ports/local-distfiles/%SUBDIR%/" which will be mirrored from
peoples' ~user/public_distfiles on freefall. Add two mirrors
(Japan and Germany).
Requested by: obrien (moving)
Submitted by: will (German mirror)
(3) Simplify definition of PKGBASE since it can now be defined as
simply ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}, instead of
sed'ing out the version number from ${PKGNAME}.
Submitted by: hoek
(4) Remove unnecessary targets prefix and mtree-file, which can be
implemented as "make -V PREFIX" and "make -V MTREE_FILE",
respectively. Don't define MTREE_FILE when NO_MTREE is set so
"make -V MTREE_FILE" won't print out anything.
(5) Various minor typo and grammar fixes.
(6) Define NONEXISTENT?=/nonexistent. This will help quiet portlint
warnings, among other things.
support. Implies USE_AUTOCONF.
Submitted by: kiri@pis.toba-cmt.ac.jp
Reviewed by: ports
(2) New variable CONFIGURE_WRKSRC (default: ${WRKSRC}) to be set when
${CONFIGURE_SCRIPT} needs to be run in some place other than
${WRKSRC}.
Submitted by: Mario Ferreira <lioux@uol.com.br>
Reviewed by: ports
(3) Slight change in message about the port being too old for
bsd.port.mk due to missing PORTNAME/PORTVERSION. Explicitly say
that the user needs to update the port (although I'm not sure how
anyone can interpret the old message otherwise ;).
(4) Use NO_CHECKSUM instead of the undocumented FORCE_FETCH to
override the "distfile missing from files/md5" check. Also change
the NO_CHECKSUM message a bit more forceful ("If you are
absolutely sure...").
Submitted by: mharo
(5) Refer to the OpenSSL section in handbook by name, not number.
Approved by: Kris
PR: 17524
(6) New file bsd.emacs.mk that will be automatically be included if
EMACS_PORT_NAME is defined. bsd.emacs.mk sets various variables
to make maintenance of emacs ports easy.
Submitted by: shige
Reviewed (in spirit) by: ports, ports-jp
(7) Remove the automatic creation of ${PREFIX}/info/dir from
/usr/share/info/dir (install-info from 3.1R onwards automatically
creates the dir file if none exists). Delete ${PREFIX}/info/dir
upon deinstallation if it doesn't have any menu entries.
Reviewed by: ports
(8) Two new targets mtree-file and prefix. They print ${MTREE_FILE}
(empty if NO_MTREE is set) and ${PREFIX}, respectively. They are
used by package building scripts.
(9) Don't register package dependency in +REQUIRED_BY for
PKG_IGNORE_DEPENDS ports. Otherwise you'll end up with bogus
entries since "pkg_delete oneko" won't delete oneko from
XFree86/+REQUIRED_BY, etc.
Found by: bento
Submitted by: imura
(2) Don't complain about distfiles not listed in files/md5 if we are doing
"make makesum".
Reported by: mharo, cpiazza
Reviewed by: mharo
now required.
(2) Check whether a distfile is in files/md5 before fetching instead
of after. Also print out a distinct message so we can easily catch
someone screwing up the distfile list (usually via DISTNAME).
if ${.CURDIR} != ${MASTERDIR} (i.e., this is a slave port).
Suggested by: knu
(2) Move PKGNAME/DISTNAME definition into the pre.mk section so it can
be used in ports' Makefiles.
package name includes "language specifics" or "compilation options" as
specified in the handbook. PKGNAME is now defined as
${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}.
Suggested by: mharo (prefix), reg (suffix)
Reviewed by: the ports list
New variables:
PORTNAME - Base name of port
PORTVERSION - Version of port
Modified variables:
PKGNAME - Always ${PORTNAME}-${PORTVERSION}; error to override this
DISTNAME - Defaults to ${PKGNAME}
Right now old style is still accepted (unless REQUIRE_PORTNAME is
defined) but all port Makefiles will be converted this weekend and
bsd.port.mk will be changed again to have the new style be mandatory.
Reviewed by: the ports list, mharo in particular
(2) Change "clean" to be more generic -- it now has
pre-clean/post-clean helpers (it only had pre-clean before) and
the actual work is in do-clean so porters can redefine it if
necessary.
Requested by: "Matthew N. Dodd" <winter@jurai.net>
Reviewed by: dirk
after post-patch to before pre-patch.
Submitted by: reg (libtool maintainer)
(2) Misc. cleanup, pass MAKE_ENV to ${XMKMF}, etc.
Submitted by: reg
(3) Document ALL_TARGET and INSTALL_TARGET.
PR: 17334
Submitted by: Patrick Seal <patseal@hyperhost.net>
Seconded by: a whole bunch of people, including Marcel, our linux-czar
(2) Fix typo in openssl messages.
Submitted by: Will Andrews <andrews@technologist.com>
4-current post bison-removal and to a no-op otherwise. Note this
should only be used when the software in question uses a feature
in bison that is not in byacc -- otherwise it should be patched to
use byacc (or detect the absense of bison correctly). [bsd.port.mk]
(2) Do not assume all category names are lowercase. In particular,
remove package links by removing them one by one, instead of doing
a "rm [a-z]*/${PKGNAME}.tgz". [bsd.port.mk]
(3) Do not assume the category name doesn't include a path separator
(/). Make links accordingly. [bsd.port.mk,README.category,README.port]
(4) Do not assume all category makefiles are directly under
${PORTSDIR}. [bsd.port.mk,README.category]
(5) Add new "package-name" target which prints out the directory name
to be used in the parent README.html. [bsd.port.subdir.mk]
(2) through (5) are in preparation for going to multi-level
categories. They shouldn't make any difference yet, but are committed
first so people can start testing.
(2) Add ipv6 and tcl/tk83 to list of valid categories.
Requested by: sumikawa, jseger
(2) Change OSVERSION for NEWGCC check to a more appropriate time for the
actual cutover.
(3) Change XFree86 version in PKG_IGNORE_DEPENDS from 3.3.5 to 3.3.6.
(4) Change some ${ECHO_MSG}'s in fatal errors to ${ECHO}, no need to be quiet
if there's something terribly wrong.
with directory names.
Submitted by: jdp
(2) Preserve +REQUIRED_BY file when FORCE_PKG_REGISTER is defined.
Reviewed by: steve
(3) Add new variable EXTRA_PATCHES, which can be set to some files
outside of ${PATCHDIR} (which usually means ${WRKDIR}). These
will be applied after distribution patches but before the normal
${PATCHDIR} patches.
Useful when you have dynamic patches.
(4) Move USE_QT2 earlier, the USE_NEWGCC dependency wasn't working
because it came after the USE_NEWGCC check. Move USE_QT alongside
new location of USE_QT2.
Submitted by: imura
(5) Substitute ftp.cdrom.com for ftp.funet.fi in MASTER_SITE_SUNSITE,
which no longer seems to be a full mirror anymore.
Submitted by: Ade Lovett <ade@lovett.com>
PR: 14221
(6) Fix typo in MASTER_SITE_FREEBSD case -- it used ${MASTER_SITES}
(instead of ${PATCH_SITES}) to fetch distribution patches. That
obviously would fail if the user attempted to build a port before
the distribution patches showed up at ftp.FreeBSD.org.
(7) Remove tcl75, tk41 and tk81 from the list of valid categories.
(tcl81 is still used.)
Submitted by: jseger
(8) Make delete-package-list a little more verbose by making it check
the existence of a package file and print out what it's doing.
Silence bogus warnings from delete-distfiles-list by redirecting
stderr from rmdir to /dev/null.
(9) Remove OpenBSD_MAINTAINER=imp, he hasn't been doing any work with
this file on the OpenBSD repository for a long time.
Submitted by: imp
Submitted by: many people
(2) Surround the perl describe target with an echo ``. We'll see if
it will help with the index corruption problems.
(3) Manpage handling fix to avoid command line too long errors for
ports with a lot of manpages.
Submitted by: hoek
Submitted by: cpiazza
Approved by: imura (qt2 maintainer)
(2) Add CC and CXX to MAKE_ENV if USE_NEWGCC is defined.
Suggested by: cpiazza
(3) Update XFree version PKG_IGNORE_DEPENDS.
(4) Add ${WHICH}=/usr/bin/which and use it.
Submitted by: Yoshiaki Sakae <sakae@is.titech.ac.jp>
(5) Update afterstep and windowmaker master sites.
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
(6) Add tcl82 and tk82 to list of valid categories.
Submitted by: A whole bunch of people
(7) Use .MAKEFLAGS, not DEPENDS_ARGS to pass FORCE_PKG_REGISTER to
submake when DEPENDS is defined -- the latter is too late.
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.
Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.
