Commit Graph

411 Commits

Author SHA1 Message Date
Kris Kennaway
e262cbd7e6 Switch over to XFree86-4.x for ${OSVERSION}>=450005. If you are tracking
-STABLE, this will take effect after your next cvsup + kernel upgrade.
2002-04-27 11:22:59 +00:00
Maxim Sobolev
ac09919701 Heroic attempt to reduce number of PRs assigned to portmgr@:
1. Make PY_DISTUTILS recently added into <bsd.python.mk> actually working.

PR:		36537
Submitted by:	tg

2. Propagate error code from failed `make depends', when one of the ports
   we depend upon is marked BROKEN/FORBIDDEN.

PR:		25522
Submitted by:	alex

3. By default, when bsd.port.mk configurating Makefile.PL only pass
   PREFIX as argument, but some Perl module (eg. Test-Harness) needed
   INSTALLPRIVLIB and/or INSTALLARCHLIB in order to install, otherwise
   default installation will goes to /usr/lib and not ${PREFIX}/lib,
   in some case, adding these tag to CONFIGURE_ARGS is not bad.

PR:		29681
Submitted by:	Shell Hung <shell@shellhung.org>

4. Update patch-libtool target, so that it doesn't break ports with
   autoconf 2.13-generated configure script. USE_LIBTOOL is still not
   very useful for such cases, but at least it doesn't break them badly
   anymore.

PR:		31142
Submitted by:	wjv

5. Make `make search' working even when /usr/obj/usr/ports exists.

PR:		31862
Submitted by:	gad

6. When configure script fails unexpectedly don't dump thousands lines of
   config.log to the user's screen, because it usually doesn't contain
   information useful for tracking the problem anyway. Instead display a
   message asking a user to report the failure to the proper entity
   (maintainer) and what to include into the problem report.

PR:		34459, 35488
Submitted by:	Thomas Hurst <freaky@aagh.net>
		Alan Eldridge <ports@geeksrus.net>
		sobomax
		other countless hackers whose names are lost in the noise
Text of message suggested by:	asmodai

7. Make PREFIX=/usr situation more sane. When PREFIX is set to /usr,
   bsd.port.mk uses MANPREFIX=${PREFIX} and BSD.local.dist for mtree as
   always, however those defaults are not appropriate for /usr, and better
   options are available.

PR:		36030
Submitted by:	DougB

8. Use ${ECHO_CMD} instead of ${ECHO} everywhere in the bsd.port.mk to
   avoid clashing with system .mk settings (${ECHO} has a different meaning
   there). Actually the patch is imcomplete, because large portion of those
   ${ECHO_CMD}s should be ${ECHO_MSG}, but this one will at least make Bruce
   happy, which shouldn't be underestimated.

PR:		34988
Submitted by:	knu

All of the above tested by:	bento
Special thanks goes to:		kris (for his help with getting this tested)

-------------------------- THE END (to be continued) ------------------------
2002-04-25 15:28:48 +00:00
Maxim Sobolev
59de89b322 Fix another "last" bug introduced with the speed-up commit. In some conditions
the bug resulted in "sh: Argument list too long" message during dependency
registration process.

Reported by:	*many*
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>
2002-04-04 10:06:00 +00:00
Ade Lovett
b13d153e13 Fix missing quotes around one instance of
if [ ! -z "$$select" ]

Submitted by:	lioux
2002-04-03 01:17:57 +00:00
Kris Kennaway
59ac30e126 Fix a fetch bug in MASTER_SITES_NN introduced in rev 1.396.
Submitted by:	lioux
PR:		ports/36078 (part of)
2002-04-02 05:24:33 +00:00
Ernst de Haan
d53122988d Added bsd.java.mk. This adds Java-specific support to ports by
means of a USE_JAVA definition. If a port does not define
USE_JAVA, then this change should not affect that port.

The purpose of this bsd.java.mk file has been extensively
discussed on the freebsd-java mailing list. The current
bsd.java.mk is based on the following specification documents:

http://www.metaverse.nl/~ernst/installing.html
http://www.metaverse.nl/~ernst/writing.html

A proposal that lead to the development of these documents and
finally the current bsd.java.mk file is:

http://www.metaverse.nl/~ernst/freebsd-java-proposal-20011116.html

The bsd.java.mk has been sent to portmgr for review. They had
no objections.

Reviewed by:	portmgr@FreeBSD.org, java@FreeBSD.org
Approved by:	sobomax@FreeBSD.org
2002-03-28 11:24:43 +00:00
Maxim Sobolev
c3fbe51db3 The second, and I hope the last, revision of speedup patch - make USE_SUBMAKE
working as advertised. This should fix mod_phpX and probably some other 30
ports that use USE_SUBMAKE. Default behaviour remains exactly the same.

Prompted by:	dirk
2002-03-28 09:58:08 +00:00
Maxim Sobolev
3c634c1303 Slightly adjust speedup patch, so that it works when user specifies unnatural
targets sequence, i.e. `make clean build'. It doesn't affect default behaviour.

Reported by:	knu
2002-03-27 04:26:44 +00:00
Maxim Sobolev
d6ce894ff6 - Significantly reduce overhead associated with bsd.port.mk by replacing .USE
macro, which was invoking separate make(1) process for each of the main
  targets, with explicit make(1) targets and specifying the dependencies on
  those targets in normal Makefile way. This gives up to 4x speedup. For the
  ports relying on the old functionality (i.e. each main target in a separate
  make(1) process) provide a USE_SUBMAKE knob, which provides old behaviour;

- speed-up dependency registration process by the factor of two, which
  could be a great win especially for things like GNOME and KDE with very long
  dependency chains;

- clean-up internal structure of the file, so that it is easier to understand
  and extend it when necessary.

Inspired by:	NetBSD
Reviewed by:	freebsd-ports@
Tested by:	bento
2002-03-25 08:48:47 +00:00
Will Andrews
089c1bb234 XFree86 4.2.0 Stage 1: bsd.port.mk
[1] Handle HTML-ified manpages in plists.
	[2] Add --x-[libraries,includes]=${X11BASE}/[lib,include] if we are
	    using GNU_CONFIGURE in this port.  This is required if the port
	    adds a bunch of other libraries by default to CPPFLAGS and
	    configure gets a false positive.

Submitted by:	[1] sf
		[2] many people
2002-03-16 23:37:02 +00:00
Mark Murray
05e08061c2 Take Perl 5.6.1 into account. Allow for slow updaters who prefer to
stay with an older CURRENT and perl 5.6.0.
2002-03-16 22:47:00 +00:00
Andrey A. Chernov
a35cebf9cf Add -D_THREAD_SAFE for -current too
Approved by:	portmgr & ports silence
2002-02-24 16:54:34 +00:00
David E. O'Brien
b5e6b050c5 Fix a typo in the CD_MOUNTPTS bits.
Submitted by:	Alexander Zagrebin <alexz@visp.ru>
2002-02-22 18:53:28 +00:00
David E. O'Brien
2dba26a1c7 Fix the default CONFIGURE_TARGET to one that is a proper GNU tuple.
Approved by:	several portmgr members
2002-02-21 18:24:20 +00:00
Steve Price
ecaa30aadc Add a default value for _PATCH_SITES_DEFAULT so the MASTER_SITE_N
patch is functional.
2002-01-24 01:15:03 +00:00
Will Andrews
78be64afad Bring in changes tested on bento's new 4-exp tree, specially fitted for the
4.5 release.

 1) Add support for MASTER_SITE_N.  This is by far the largest part of
    this patch; many thanks to Mario for his hard work on this!
    Submitted by:	lioux

 2) Allow multiple CD mountpoints to be specified.
    PR:			8063
    Submitted by:	MOROHOSHI Akihiko <moro@race.u-tokyo.ac.jp>
    Rewritten by:	will (with suggestions from steve)

 3) Fix MLINKS description.
    PR:			29876
    Submitted by:	dirk

 4) Add imake dependency for XFree86 3.x when USE_IMAKE is defined
    because it's possible the port may not need X itself, but just imake.
    Submitted by:	max

 5) Fix installing as non-root with ${INSTALL*} macros.
    PR:			25531
    Submitted by:	Martin Kammerhofer <mkamm@gmx.net>

Thanks to Kris Kennaway <kris> and Steve Price <steve> for helping make the
experimental tree on bento a reality.
2002-01-23 03:48:44 +00:00
Will Andrews
fa8f93bcfc Add AUTOMAKE_ARGS+=-i by default if AUTOMAKE_VER != 1.5. This generates
Makefiles more useful for non-GNU make(1).

Requested by:	obrien
Reviewed by:	steve, bento 4-exp
2001-12-22 17:13:38 +00:00
Mario Sergio Fujikawa Ferreira
0273a8420e Add USE_AUTO{CONF,MAKE}_VER following original idea from bsd.kde.mk
by will

1) Make selection of AUTO{CONF,MAKE} flexible depending on *_VER
   variables.
2) This is backward compatible with previous behavior. For example,
   {ACLOCAL,AUTO{CONF,HEADER,MAKE,RECONF,SCAN,UPDATE,IFNAMES}} are
   set with default values even if USE_AUTO* are not set.
3) Have the defaults be devel/autoconf213 and devel/automake14 ports
   (just set the USE_*VER?= to the latest values, or a bogus value).
   If the user sets a bogus value, we use the default values.
4) Furthermore, add variables in the same sense of the
   PTHREAD_* vars. We must be able to automagically patch the ports
   based on the correct
   {ACLOCAL,AUTO{CONF,HEADER,MAKE,RECONF,SCAN,UPDATE,IFNAMES}}
   values.
5) Moreover, add {ACLOCAL,AUTO{MAKE,CONF}}_DIR variables pointing
   to the right locations based on the *_VER variables, this is
   useful if a port needs to grab files from those. This might seem
   too much but if we want automagical, we should go this extra
   mile.

Requested by:	too many
Reviewed by:	portmgr, ports
Approved by:	portmgr (will), ports (silence)
2001-11-28 05:00:36 +00:00
Akinori MUSHA
919909471b Fix a wrong comment. PATCHDIR is now ${MASTERDIR}/files by default,
not ${MASTERDIR}/patches.

PR:		ports/30328
Submitted by;	Hye-Shik Chang <perky@python.or.kr>
2001-11-17 21:35:39 +00:00
Akinori MUSHA
5493715c67 Add bzip2 support for distribution patches. The bzip2 dependency is
automatically added if there is a .bz2 patch in PATCHFILES.

PR:	ports/16252 and ports/30862
Seven months have passed since the PR was assigned to:	portmgr
2001-11-17 21:23:09 +00:00
Akinori MUSHA
e00f292763 Add a bunch of generally used command macros:
BZCAT, BZIP2_CMD, CHGRP, CUT, DC, ECHO_CMD, EGREP, FILE, FIND,
    HEAD, ID, IDENT, STRIP_CMD, SU, TAIL, TEST, XARGS

And use shell (ash or ksh) builtins where available for efficiency:

    ECHO_CMD, FALSE, TEST, TRUE

Grepping the ports tree, a few dozen ports already have FIND,
STRIP_CMD and XARGS variables on their own and numerous ports use
these commands without using macros.  Some ports use FILE as a .for
loop variable, but it doesn't matter anyway.

Obtained from:	NetBSD

Remove the definition of ECHO because it is already defined in
/usr/share/mk/sys.mk and leaving the useless definition may mislead
developers.  Add the following comment that would help:

    # ECHO is defined in /usr/share/mk/sys.mk and its value can either be
    # "echo", or "true" if the make flag -s is given.  Use ECHO_CMD where
    # you mean the echo command.

No response yet from:	portmgr
Clued by:	Cyrille Lefevre <clefevre@citeweb.net> (on ${ECHO})
2001-11-17 21:05:50 +00:00
Akinori MUSHA
2f28d718b7 Define EXAMPLESDIR as well as DOCSDIR and DATADIR. Of course this
does not clobber the existing definitions because of the `?='
assignment.

Grepping the whole ports tree, a few dozen ports already define this
variable on their own and most of them have the same value as this
(${PREFIX}/share/examples/${PORTNAME}).

Approved but not committed by:	portmgr
2001-11-17 20:08:05 +00:00
Akinori MUSHA
38d33ba583 Fix PKG_IGNORE_DEPENDS so it matches the latest XFree86 3.x port.
As I didn't see why the full package name is needed there, I changed
it to a simple regexp that matches any later version of the XFree86
3.x port.

No response from:	portmgr
2001-11-17 19:56:29 +00:00
Thomas Gellekum
5a08ef716f Add variables $ACLOCAL and $AUTOHEADER, now that the program names
contain version numbers.

Approved by:	portmgr (sobomax)
2001-11-13 13:12:11 +00:00
Akinori MUSHA
345bbe4bfd Fix a quoting bug in `make describe'.
- Do not shrink series of spaces.
  - Do not expand shell wildcards in pkg-comment.

I made the code cleaner and (3-4%) faster while I was at it.

Tested by:	diff(1) and its option -b

(Maintainer timeout)
2001-11-09 15:48:40 +00:00
Mark Murray
494b884718 Allow the perl version and architecture to be overridden. 2001-11-05 21:28:44 +00:00
Maxim Sobolev
897f02c57d Fix abuse of ${AUTOMAKE}/${AUTOCONF} 2001-10-30 09:59:56 +00:00
David E. O'Brien
eec70b011f USE_AUTOCONF and USE_AUTOMAKE now depend and use the legacy versions.
This is the fastest way to move forward.  A better way would be to
set USE_AUTOCONF and USE_AUTOMAKE to the version desired.  We can do that
later, I don't want to hold up the update of the autoconf and automake
ports the latest versions.
2001-10-29 01:42:08 +00:00
David E. O'Brien
25ffb4fb92 Switch to building -current ports against XFree86 4.x.
Approved by:	silence from portmgr
2001-10-09 07:37:34 +00:00
David E. O'Brien
e565d118b2 Add a "LATEST_LINK" knob. This makes it easy to set the Latest link, so that
less ports have to use NO_LATEST_LINK, and we won't have to keep artificially
setting the PORTNAME to get the Latest link logic to do something reasonable.

Approved by:	will
2001-09-28 16:45:15 +00:00
David E. O'Brien
cb6871115a Fix a spelling mistake. 2001-09-23 00:35:08 +00:00
David E. O'Brien
1ec9e868fa Change "USE_NEWGCC" to "USE_GCC295" and add "USE_GCC30" for soon future use.
Approved by:	portmgr
2001-09-23 00:33:58 +00:00
Akinori MUSHA
96dc9224a6 Include ${PKGNAME} in the names of cookie files so that a port would
never re-use outdated, stale working directories.

Approved by:	portmgr (sobomax)
2001-09-22 11:42:33 +00:00
Will Andrews
e245a57d50 Update library pointer for Mesa3 port in USE_MESA so that if
XFREE86_VERSION=4, Mesa3 will not get left out of the install.  Previously,
bsd.port.mk would find libGLU.so.1 from XFree86-4 and thus wouldn't install
libglut.so.3 needed by XFree86-4 users for USE_MESA.

PR:			29546
Submitted by:		petef
Urged on by for 4.4R:	sf
2001-08-31 02:13:02 +00:00
Will Andrews
a16fefc81e Minor changes:
1) Bump PKG_IGNORE_DEPENDS for XFree86 to XFree86-3.3.6_9
	2) Modify LDCONFIG_RUNLIST to apply RE multiple times on the
	   same line.  Needed for some ports.

PR:		27645 (1)
Submitted by:	Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp> (1),
		demon (2)
Reviewed by:	portmgr
2001-08-27 00:09:05 +00:00
Thomas Gellekum
84985a3274 <expletive>
Revert, this change wasn't supposed to go in.
2001-08-03 11:35:35 +00:00
Thomas Gellekum
f535a67aba Use a variable for PYTHON_PORTVERSION. 2001-08-03 11:20:33 +00:00
Akinori MUSHA
edc6033a2d Do not build-depend on archivers/bzip2 if the system has
/usr/bin/bzip2, now that bzip2 is MFC'ed to 4-STABLE.

Approved by:	portmgr
2001-08-01 09:01:48 +00:00
Steve Price
27f71f8f05 (1) Fix a typo becuase -> because.
Submitted by:	Thierry Thomas <thierry@thomas.as>

(2) Allow USE_X_PREFIX to be set to NO so that ports can use imake and
    not have to be installed in ${X11BASE}.

Submitted by:	Masafumi NAKANE <max@wide.ad.jp>
2001-07-25 18:10:16 +00:00
Maxim Sobolev
28429a3cbd Similarly to DOCSDIR add DATADIR?=${PREFIX}/share/${PORTNAME}. Also slightly
expand comment for DOCSDIR, so it is immediately clear what its value is.

Ignored by:	obrien, portmgr
2001-07-10 07:50:17 +00:00
David E. O'Brien
9f9a41c8c3 Add "DOCSDIR=${PREFIX}/share/doc/${PORTNAME}" so every port in the world
can stop duplicating this.  We can also add knobs in the future to
autmatically create the directory and what not.

Approved by:	portmgr
2001-07-09 22:23:26 +00:00
FUJISHIMA Satsuki
2f541dec74 BUILD_DEPENDS on bzip2 only if ${OSVERSION} < 500021.
Approved by:	portmgr
2001-06-29 14:26:38 +00:00
Maxim Sobolev
94245bb96d Harden a wording of ``do not commit here'' warning at the top of the file. It
appears that previous wording was not strong enough to prevent people from
doing unauthorised changes.
2001-06-28 19:54:45 +00:00
Brian Somers
5764c1943e Remove some extraneous breaks
PR:			27909
No response from:	portmgr
2001-06-28 14:58:44 +00:00
Doug Barton
44e687d0d7 Upgrade openssl to 0.9.6a and bump the shlib version in the process
due to non-backwards compatible changes. The shlib bump necessitates
a corresponding bump in bsd.port.mk for the automagic openssl
dependency. Mistakes in the port are my responsibility. Approval for
the bsd.port.mk commit comes through asami -> kkenn -> me. Kris is
a little busy at the moment, so he asked me to lob it in.

Approved by:	kris
2001-05-23 02:47:02 +00:00
Satoshi Asami
8a8dc68a16 New category picobsd starts today. 2001-04-22 16:47:55 +00:00
Satoshi Asami
f7ed4a7d58 (1) Move inclusion of bsd.kde.mk to the right place.
Reviewed by:    will
Tested on:      bento

(2) Chase XFree86-3 revision.
2001-04-16 10:28:15 +00:00
Will Andrews
dbba8af644 Overhaul QT/KDE support:
- 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)
2001-04-03 08:14:43 +00:00
Satoshi Asami
cb7dd7e8da (1) Change maintainership of bsd.port.mk to portmgr@FreeBSD.org. This is
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)
2001-03-24 21:35:22 +00:00
Satoshi Asami
7c30b43aa0 (1) Change USE_NEWGCC dependency from lang/egcs to lang/gcc295.
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
2001-02-17 00:46:26 +00:00