Commit graph

72 commits

Author SHA1 Message Date
Kris Kennaway
51d481bd21 NO_PACKAGE and NO_CDROM are superfluous here 2006-09-03 17:34:12 +00:00
Erwin Lansing
50513d5d52 Add support for DESTDIR part I.
This commit should largele be a NOOP as it only adds support
for DESTDIR undefined. This does allow us to start testing
ports with DESTDIR set, but this is as of yet not supported.

Although this has been extensively tested on pointyhat, this
is a very intrusive change and some cases may have been
overlooked. Please contact Gabor and me if you find any.

PR:             100555
Submitted by:   gabor
Sponsored by:   Google Summer of Code 2006
2006-08-04 12:34:50 +00:00
Edwin Groothuis
7c6393360c Remove USE_REINPLACE from the categories starting with L 2006-05-09 20:52:24 +00:00
Alexander Leidinger
23b3bc4b0d Mega-patch to cleanup the ports infrastructure regarding our linux bits:
- 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.de
	cracauer@cons.org
	des
	girgen
	jamie@bishopston.net
	mezz
	mi
	nivit@users.sf.net
        pat
	simond@irrelevant.org
	riggs@rrr.de
	Udo.Schweigert@Siemens.com
2005-06-17 22:59:29 +00:00
Trevor Johnson
e66743b7d5 Respect the user's USE_LINUX setting. 2005-03-01 21:51:48 +00:00
Alexander Leidinger
64cf27c85d 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
2004-12-31 18:24:10 +00:00
Alexander Leidinger
64aff1c784 Update to 7.1.042. 2004-10-16 17:04:51 +00:00
Alexander Leidinger
66acd174b7 Update to 7.1.040. 2004-07-24 10:43:25 +00:00
Alexander Leidinger
6f1237c2a2 Update to 7.1.038. 2004-05-26 14:51:16 +00:00
Alexander Leidinger
1b932ea47d - Update to 7.1.037.
- Incorporate the C++ DSO Object Destruction API for < 502101 systems
  (icc v8 already does this). [1]
  If you use icc7 on such a system, you have to recompile C++ programs
  (including stldport-icc).
- Simplify the post-extract now that we only extract one rpm. [1]

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
2004-03-20 16:16:37 +00:00
Alexander Leidinger
baa8612f1d - some base system headers know about icc now, don't override them
where appropriate [1]
- make portlint happy [1]
- sync icc7 and icc [1]
- add linux_base as a patch depends for icc v8

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
Requested by:	maintainer [1]
2004-03-13 10:33:18 +00:00
Alexander Leidinger
6919cc4384 icc & icc7:
- correct the use of ECHO_CMD and ECHO (swap them) [1]

icc:
 - fix the DISTFILE handling, it's automatically available after
   bsd.port.post.mk, not after bsd.port.pre.mk, so set it explicitly
   to be able to use it in the check for the IGNORE message [1]

icc7:
 - don't extract the Intel debugger, it's not usable without a
   threads debugging lib
 - USE_SIZE

Noticed after:			reading the commit log/diff of the
				ifc port [1]
Submitted indirectly by:	maho, hrs [1]
2004-02-01 13:37:13 +00:00
Trevor Johnson
439b8a040c Use the CPIO macro defined in bsd.port.mk. 2004-01-22 12:18:43 +00:00
Alexander Leidinger
886ae5bd05 After the fast bandaid fix for patch-...{icc,icpc} for those fast
upgrader adopters commit a better fix which also respects PREFIX.

Bump PORTREVISION for this fix, not bumping it for the bandaid fix
was intended.
2004-01-11 17:35:29 +00:00
Alexander Leidinger
a2f3809140 - connect icc7 to the build after a repocopy from icc
- update icc7 to 7.1.035
- sync parts of icc7 with the icc (v8) port
2004-01-11 15:34:17 +00:00
Alexander Leidinger
86837889b7 - use the libc cxa support on a recent -current instead of the hack
NOTE: you need to rebuild stlport-icc and maybe some other C++
         programs/libs.
 - rework ld.c to fix the build of stlport-icc on 4.x (first part
   of the build fix, the second part follows shortly in a stlport
   commit) [1]

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
2003-12-22 15:03:23 +00:00
Alexander Leidinger
18a58e67ad - Update to 7.1.034.
- Modify plist to print a diagnostic instead of a pkg_delete warning
  if there's a license in the license directory.
2003-12-13 13:11:20 +00:00
Alexander Leidinger
8697f3d4a9 s/rpm2cpio/rpm2cpio.pl/ after the recent update of archivers/rpm2cpio (the
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.
2003-12-12 13:43:05 +00:00
Alexander Leidinger
313f5fd733 Update to 7.1.033. 2003-12-08 13:29:42 +00:00
Alexander Leidinger
848d6ca026 correct the syntax of the warning -> error options 2003-11-14 12:23:12 +00:00
Alexander Leidinger
07fe1a29a3 - Update to 7.1.032.
- Transform some warnings into errors as suggested by some included
  docs (some kind of MSVC compatibility which isn't reverted in icc
  for linux).

ld.c:
 - add possibility to use a different threads lib via PTHREAD_LIBS
   variable (e.g. PTHREAD_LIBS=-lthr) [1]
   this may be subject to change when gcc learns how to handle our
   different threads libs
 - refactor some code [1][2]
 - remove mailwrapper license, there's no code from mailwrapper
   anymore [2]
 - correct the order of libc and libc_r [1][2]

Submitted by:	mi [1]
Submitted by:	Marius Strobl <marius@alchemy.franken.de> [2]
Reviewed by:	Marius Strobl <marius@alchemy.franken.de> [1]
2003-11-14 12:09:17 +00:00
Trevor Johnson
bb34de42c0 Use the FIND and XARGS macros introduced in bsd.port.mk 1.391. 2003-11-13 13:30:42 +00:00
Alexander Leidinger
886e12f66c Add a paragraph about Intels support in the post-install message. 2003-11-10 21:32:11 +00:00
Alexander Leidinger
ca836af07e - Fix icc and icpc scripts (variable overriding) [1]
- Don't extract ia64 RPMs [2]
- Fix bug on some 4.7 systems [3]

Noticed by:	mi [1]
Suggested by:	mi [2]
Tested by:	Clint Olsen <clint@0lsen.net>
2003-10-22 13:21:30 +00:00
Alexander Leidinger
aebf0bc438 Update to 7.1.031. 2003-10-21 11:10:23 +00:00
Alexander Leidinger
c9b4723f5a Reword IGNORE text.
Suggested by:	Intel Corporation
2003-10-11 10:59:45 +00:00
Alexander Leidinger
8647e47ef8 Update to 7.1.030. 2003-10-03 12:12:06 +00:00
Alexander Leidinger
d30559b66c Update to 7.1.029. 2003-09-24 12:53:09 +00:00
Alexander Leidinger
18f670da27 Update to 7.1.028. 2003-09-06 10:09:19 +00:00
Alexander Leidinger
df7dde8b41 Fix __sigsetjmp linking problem. 2003-08-22 11:20:38 +00:00
Alexander Leidinger
d3c3508516 - Update to 7.1.027.
- Teach the ld wrapper about /libexec on a recent -current. [1]

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
2003-08-21 14:55:43 +00:00
Alexander Leidinger
daaf1aa22e - Update to 7.1.025.
- Fix spelling of CONFLICTS [1].
- Add request for benchmark numbers [2].

Noticed by:	Andreas Schweitzer <Andreas.Schweitzer@hs.uni-hamburg.de> [1]
Discussed with:	Intel [2]
2003-08-15 13:00:08 +00:00
Alexander Leidinger
97a274bb99 Update to 7.1.021. 2003-07-11 15:48:05 +00:00
Alexander Leidinger
0f48a3a140 Update to 7.1.019. 2003-06-26 13:11:41 +00:00
Alexander Leidinger
29bd595d7c Fix the "make fetch" help string.
Noticed by:	markm
2003-06-15 17:57:26 +00:00
Alexander Leidinger
1636eac6ca Update to 7.1.018. 2003-06-12 10:52:08 +00:00
Alexander Leidinger
fb19333309 Update to 7.1.017. 2003-06-04 18:37:07 +00:00
Alexander Leidinger
bcbf3d5607 Update to 7.1.014. 2003-05-06 15:52:01 +00:00
Alexander Leidinger
aec1848380 When trying to link dynamic libraries with dependancies, e.g:
icc -shared -o libfoo.so foo.o -lbaz

the ld wrapper gets confused and thinks that a static link is intended
and the link fails. This patch appears to fix things.

Submitted by:	dfr
2003-04-26 10:27:29 +00:00
Alexander Leidinger
f28a4a6666 Update to 7.1.011. 2003-04-24 15:08:34 +00:00
Alexander Leidinger
fe4d1d2986 - back out special '-I' handling, it causes problems with the stlport [1]
(this may break ports which depend upon OpenSSL from ports which was
   compiled as a base system replacement because it includes a system
   header directory again)
 - ignore "-pipe" in CFLAGS, this should unbreak some ports with hardcoded
   "-pipe"

Noticed by:	Krzysztof Parzyszek <kristof@swissmail.org> [1]
Tested by:	Krzysztof Parzyszek <kristof@swissmail.org> [1]
2003-04-18 09:10:22 +00:00
Alexander Leidinger
a85b627940 The new version of icc adds -I include paths before the standard include
path, thus adding a system path with -I results in not respecting the
sunstitute headers. This results in problems because we have some important
changes there.

Parts of this commit where
Submitted by:	marius@alchemy.franken.de
2003-04-02 10:50:38 +00:00
Alexander Leidinger
81ac3ff758 - Update to 7.1.006.
Submitted by:	marius@alchemy.franken.de

 - Minor cosmetics (FIND) and corrections (COMMENT).
2003-03-28 10:45:57 +00:00
Ade Lovett
7e52725f2a Clear moonlight beckons.
Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.
2003-03-07 06:14:21 +00:00
Alexander Leidinger
1063cdc7db Update to 7.0.086. 2003-03-05 18:55:31 +00:00
Alexander Leidinger
9308657f35 Update to 7.0.083.
I'm not aware of a change between 7.0.082 and this version which affects
FreeBSD, so no need to update if you already have 7.0.082 installed.
2003-02-15 15:46:17 +00:00
Alexander Leidinger
97084c21a6 - update to 7.0.082
- fix [dfi]vec.h with stlport-iostreams
- do not install a Windows header (mathf.h)
- do not install libompstub (depends on pthread_atfork(), see PR 17437)

Submitted by:	marius@alchemy.franken.de

- point to the icc errata after make install
2003-02-10 14:04:11 +00:00
Alexander Leidinger
975e877006 Remove the "warning -> error" options for excessive function arguments,
they seem to cause problems in some cases.

Noticed by:	roberto, marius@alchemy.franken.de
2003-01-13 10:39:22 +00:00
Alexander Leidinger
26a1b6773a Update icc to 7.0.078.
Note:
Object files built with version 6.0 of Intel(R) Compilers may not link
properly with objects built with version 7.0 of Intel(R) Compilers.
Rebuilding of the object files is suggested.

Changes between the submitted version and the committed version:
 - update to 078 instead of 075
 - treat excessive parameters in function calls as an error instead
   of a warning (removed compatibility with a not named MS product, as
   suggested by Intel)
 - allow to override the INTEL_FLEXLM_LICENSE variable

From the submitter:
- Unbreak usage of signal.h on -current and RELENG_5_0.
  (committers note: see below)
- Fix ownership of installed files when built as non-root.
- Fix the patched versions of the icc- and the icpc-script to work with options
  containing spaces (e.g. '-DFOOBAR="foo bar"').
- Install 'clicense' and 'csupport' in the docs-dir even if NOPORTDOCS is
  defined, the later is not optional but required by 'icid'.
- Move the ld-wrapper to a sub-dir and thus out of what is normally set in
  PATH to prevent footshooting (this isn't perfect but simple until someone
  reworks this port to provide FreeBSD-compatibility in another way... or
  Intel releases a native version).
- Patch the headers to better fit for FreeBSD (hopefully...).

Notes:	- Icc7 is more picky about unknow options than the previous versions,
	  i.e. the gcc-options normally supplied in CFLAGS unless altered in
	  /etc/make.conf. Therefore compilation of ports with icc likely fail
	  if the standard CFLAGS are not unset (e.g. `make CC=icc CFLAGS=""`)
	  or replaced by options valid for icc.
	- When compiling multi-threaded C-code make sure to link with icc and
	  option '-mt' (for ports e.g. via PTHREAD_CFLAGS) otherwise libc_r
	  won't be linked in correctly.

Submitted by:	marius@alchemy.franken.de

Additional information:
 - rev 1.20 of src/sys/i386/include/signal.h introduced __aligned which
   isn't handled in sys/cdefs.h for non GCC compilers (at least not in
   publically available sources)
 - the FreeBSD stdarg.h is missing a macro for va_copy() in the non GCC case,
   we handle it in the port, but be prepared to get problems when the base
   system gets fixed
 - we don't use the icc-buildin of alignof()
 - Intel provides a float.h which has different floatingpoint values
   (e.g. MAX_FLOAT) than we have in the base system, in the port we use the
   FreeBSD header (Warner knows about the issue... at least he got a mail
   from me and Marius)
 - we replace __wchar_t with __ct_rune_t because icc has a build-in type
   for it, this affects "typedef __ct_rune_t __wchar_t;" in sys/_types.h.
   It isn't known if this may be evil...
 - icc doesn't need the option "-mt" anymore to generate thread safe code,
   but our FreeBSD version still needs it to be able to choose libc_r
   instead of libc

If a src-committer wants to address any of the above mentioned issues he
should first contact me, I may have already some fixes in my local tree.
2003-01-11 17:21:41 +00:00
Alexander Leidinger
56db876d70 - fix typo in message
- catch up with __sF change in -stable

Tested by:	marius@alchemy.franken.de
2002-11-13 14:39:52 +00:00