Commit graph

179 commits

Author SHA1 Message Date
wiz
e2f84ad43f Reset maintainer for retired developers. 2011-02-28 14:52:37 +00:00
hasso
1e744f5d32 Update to 7.4.4. Make software ratserizer actually work. Add one patch from
upstream repo to fix null pointer dereference.

Changes in 7.4.4:

* Fixed i965/i915 segfault in screen destruction (bug 22408)

Changes in 7.4.3:

* Fixed texture object reference counting bug (bug 21756)
* Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT
  point (SF bug 2793846)
* Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE
* Fixed some OSMesa build issues
* Fixed a vertex buffer object crash
* Fixed broken glTexImage3D() when image type = GL_BITMAP
* Fixed some GLSL preprocessor bugs
* Fixed framebuffer mem leak in i945/i965 DRI drivers
* Fixed texture coordinate repeat bug in swrast (bug 21872)
* Fixed incorrect viewport clamping (lower bound is zero, not one)
* GLX fix for glean's makeCurrent test case
2009-07-08 20:00:57 +00:00
wiz
2dfbb8286c Update Mesa and friends to 7.4.2.
Update provided by Hasso Tepper on pkgsrc-users.

Changes:
7.4.2:
Bug fixes

   * Fixed segfault when rendering to front buffer with DRI 1.
   * Fixed swrast texture rectangle bug when wrap mode = GL_CLAMP_TO_BORDER and filter mode = GL_LINEAR. (bug
     21461)
   * Fixed texture object mem leak during context destruction.
   * Fixed a state validation bug in glCopyTex[Sub]Image()
   * Fixed some i965 GLSL bugs.
   * Fixed an R300 driver texture object bad memory reference.

7.4.1:
Bug fixes

   * Fixed a two-sided lighting bug in fixed-function-to-GPU code generation
   * Fixed some Darwin issues (Jeremy Huddleston)
   * Indexing the GLSL gl_EyePlane[] or gl_ObjectPlane[] arrays with a variable was broken, bug 20986
   * Fixed incorrect texture unit bias in TXB instruction
   * glTexParameter settings weren't always propogated to drivers
   * Assorted vertex/fragment program bug fixes
   * Fixed point rendering in software rasterizer
   * Fixed potential deadlock in object hash functions
   * Fix a couple bugs surrounding front-buffer rendering with DRI2, but this is not quite complete.
   * Fixed glPopAttrib() bug when restoring user clip planes

7.4:
New features

   * Added MESA_GLX_FORCE_DIRECT env var for Xlib/software driver
   * GLSL version 1.20 is returnd by the GL_SHADING_LANGUAGE_VERSION query

Bug fixes

   * glGetActiveUniform() returned wrong size for some array types
   * Fixed some error checking in glUniform()
   * Fixed a potential glTexImage('proxy target') segfault
   * Fixed bad reference counting for 1D/2D texture arrays
   * Fixed VBO + glPush/PopClientAttrib() bug #19835
   * Assorted i965 driver bug fixes
   * Fixed a Windows compilation failure in s_triangle.c
   * Fixed a GLSL array indexing bug
   * Fixes for building on Haiku

Changes

   * Updated GL/glxext.h to version 48
   * Assorted updates for building on Solaris

7.3:
New features

   * Support for GLSL 1.20
   * Intel DRI drivers now use GEM and DRI2

Bug fixes

   * Assorted GLSL bug fixes
   * Assorted i965 driver fixes
   * Fix for wglCreateLayerContext() in WGL/Windows driver
   * Build fixes for OpenBSD and gcc 2.95
   * GLSL preprocessor handles #pragma now
   * Fix incorrect transformation of GL_SPOT_DIRECTION
   * Fixed several bugs (#18367 and #19625) in glXMakeContextCurrent()
   * Assorted Windows build fixes

Changes

   * Deprecated the "XMesa" interface (include/GL/xmesa*.h files)
   * Deprecated the "FXMesa" interface (include/GL/fxmesa.h file)
   * Deprecated the "Allegro" interface (include/GL/amesa.h file)
   * Removed include/GL/uglmesa.h header
   * Removed include/GLView.h header for BeOS

7.2:
New features

   * i965 driver: added support for G41 chipset (Intel)

Bug fixes

   * Fixed display list bug involving primitives split across lists (bug 17564)
   * Fixed some issues with glBindAttribLocation()
   * Fixed crash in _tnl_InvalidateState() found with Amira (bug 15834)
   * Assorted bug fixes for Ming build
   * Fixed some vertex/pixel buffer object reference counting bugs
   * Fixed depth/stencil bug in i915/945 driver
   * Fixed some shader flow control bugs in i965 driver
   * Fixed a few tdfx driver bugs which prevented driver from working
   * Fixed multisample enable/disable bug

Changes

   * Updated SGI header files with new license terms.

7.1:
New features

   * autoconf-based configuration (and clean-up of Makefiles)
   * Assorted DRI driver enhancements
   * Reduced dependencies between X server and Mesa
   * GL_EXT_texture_from_pixmap extension for Xlib driver
   * Support for the GL shading language with i965 driver (implemented by Intel)
   * ATI R500 series support (Radeon X1300-X1950) in r300 DRI driver

Bug fixes

   * Numerous GLSL fixes
   * Fixed some error code/detection bugs in the GLSL-related API functions
   * Lots of DRI driver fixes.
2009-06-05 11:10:35 +00:00
joerg
69ca732749 Use META_PACKAGE. 2009-04-08 23:05:45 +00:00
bjs
570f86683e Refactor declaration of PATCHFILES/PATCH_SITES again, allowing
the X server to define its own.  PATCHFILES for modular-xorg-server
are now located in ${MASTER_SITE_LOCAL:=xorg-server-patchfiles/}.
2008-10-29 22:20:28 +00:00
bjs
e9b6d32e0f Assign PATCHFILES and PATCH_SITES with += so that we don't stomp on these
definitions in x11/modular-xorg-server/Makefile.
2008-10-29 00:51:56 +00:00
bjs
97e1fd19e4 Add the following patch from upstream as a new distribution
patch and bump MesaLib's PKGREVISION.  While here, make a few
small changes to appease pkglint.

commit 2b8d8989fb6f9c36baf166fc715182a1407ebadb
Author: Ian Romanick <ian.d.romanick@intel.com>
Date:   Sun Sep 28 20:31:46 2008 -0700

    Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
    Added an x86-64 CPUID function and use it to detect 3Dnow!
    [...]
    This fixes long standing bug #8724.
2008-10-26 21:03:40 +00:00
bjs
9fc300342d Sync MesaLib with upstream mesa_7_0_branch. While here, patch
the r300 dri driver so that the __driConfigOptions symbol is visible.
This is necessary for xdriinfo and driconf to work.  Bump MesaLib's
PKGREVISION.
2008-10-21 06:25:26 +00:00
bjs
4a50c11a27 Add Makefile.version and glx-config.mk so that x11/modular-xorg-server
can share this information in lieu of us duplicating it by hand.
2008-09-18 21:10:28 +00:00
dsainty
21df75edc2 Set DIST_SUBDIR=Mesa-7.0.4.1 (via MESA_PKGVERSION).
This allows people that already have the older custom Mesa-7.0.4 tarballs
to correctly upgrade Mesa to the standard distributions without having to
know to delete the old sources or get confused by the mismatching distinfo
checkhashes.

Update the paths in the related distinfos for the change.
2008-08-23 02:51:19 +00:00
bjs
1e8d8ffb8f Update to Mesa-7.0.4 proper, which takes us to pkgsrc version
7.0.4.1.  Many of our patches are now upstream; there have also been
a significant amount of bug fixes even since our last interim update
from the 7.0 branch.

-------------------------------------------------------------------------
*** Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3 ***
-------------------------------------------------------------------------
Bug fixes

     * define #extension GL_ARB_texture_rectangle in shading language
     * fixed WIN32 compile problem in libGLU
     * Fixed a per-vertex glMaterial bug which could cause bad lighting
     * Fixed potential crash in AA/smoothed triangle rendering when using a
       fragment shader
     * Fixed glDrawElement + VBO segfault (bug 16156)
     * Fixed GLSL linker bug causing generic vertex attributes to get
       aliased
     * Fixed stack overflow when using glPixelZoom on Windows
     * Fixed broken all(bvec2) GLSL function, added misc missing bvec
       constructors
     * ARB program "state.clip[n].plane" didn't parse correctly
     * Fixed broken glGetUniformiv() (bug 13774)

Changes

     * Added support for DragonFly OS
     * Added a build config for FreeBSD static libs (Anatolij Shkodin)
     * Enabled GL_EXT_multi_draw_arrays extension in R200/R300 drivers
     * Enabled GL_ARB_point_sprite extension in I965 driver
     * Enabled GL_EXT_texture_sRGB extension in I965 driver
     * Added support for GL shading language in I965 driver

Driver Status

 Driver                  Status
 ----------------------  ----------------------
 DRI drivers             varies with the driver
 XMesa/GLX (on Xlib)     implements OpenGL 2.1
 OSMesa (off-screen)     implements OpenGL 2.1
 Windows/Win32           implements OpenGL 2.1
 Glide (3dfx Voodoo1/2)  implements OpenGL 1.3
 SVGA                    unsupported
 Wind River UGL          unsupported
 DJGPP                   unsupported
 GGI                     unsupported
 BeOS                    unsupported
 Allegro                 unsupported
 D3D                     unsupported
2008-08-17 08:25:50 +00:00
bjs
605bca5323 Add Mesa-${MESA_VERSION} subdirectory to ${MASTER_SITE_LOCAL}
so we can fetch the distfiles!
2008-07-27 00:11:05 +00:00
bjs
03aa255c8f Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,
lots of bug fixes; the intent of my update was mostly to fix
problems with i915 and r300 dri drivers and to provide the best environment
possible for the xorg server update to the 1.4 branch.

Morever, many of our patches from pkgsrc, i.e. those removed in this commit,
are now included upstream.

Additionally, MesaDemos now builds.

NOTES:

 - MesaLib now requires xf86driproto 2.0.4, as earlier versions install
   dri_interface.h, which is not correct.

 - glu now exports its symbols via libtool's -export-symfile.
   The symfile is generated pre-build--see glu/Makefile.

 - glxinfo/glxgears do not seem to need to be linked to libpthread, and this
   seems to cause problems on NetBSD with the new drm code.  If I am wrong
   about this, please let me know.  The only program that seems to need
   libpthread is glthreads in MesaDemos.
2008-07-27 00:03:42 +00:00
tnn
b0d3a124ce Manually set the patch level instead of using overly complex syntax
that lintpkgsrc doesn't understand. PR pkg/38715.
2008-06-16 15:28:56 +00:00
tnn
dacc1aa2b2 Revert previous, sharing the distinfo doesn't work because of the
MESA_PATCHLEVEL junk.

Instead make graphics/glx-utils not track the mesa patchlevel at all.
2008-05-29 20:54:14 +00:00
tnn
074608cd71 update comment 2008-05-29 19:14:17 +00:00
tnn
37f381998b The Tru64 compiler doesn't know __FUNCTION__ so just define it to __FILE__ 2008-05-29 12:43:39 +00:00
bjs
95847b1ab7 Update MESA_PATCHFILES, too; without this, the update isn't of much use. ;)
Thanks to dsainty@ for pointing it out.  Obviously I did update this while
testing it, but I did a cvs up -dPAC at some point and lost it.
2008-05-21 08:26:19 +00:00
tnn
68653acbca Fix shell pattern so it doesn't try to copy the "CVS" directory when
the shell is bash and nocaseglob is enabled (ugh, misfeature).
PR pkg/38671.
2008-05-17 18:52:17 +00:00
bjs
689307a28f The previous commit message was botched; this commit message applies
to graphics/MesaLib as well.

I've added some distribution patches for bug fixes (yes, already, it's
true) and proper DragonFly support (see the sysctl-related changes
in MesaLib/Makefile).  Agressively tracking these patches is the only
way to ensure we squash as many bugs as possible.  No patches in a
given release branch (in this case Mesa_7_0_branch) should ever
merit a bump to BUILDLINK_ABI_DEPENDS.

The head GIT commit ref for patch 002 is:
27b6fa56156673d6e7e6839658bae10de161588b

In the future, I'm going to write some sort of script or something
to manage this, but this will suffice for now.  I may also break
out some of the patch logic into a seperate mk file so that it can
be included by the xorg server, thereby ensuring the sources
are synchronized.

In other news:  I have patches for libdrm to use NetBSD's atomic
ops.  They aren't used in the library proper.  Rather, the
DRM_CAS macro in xf86drm.h now uses atomic_cas_uint.  This is, I believe,
important for proper operation, as this macro is used for context/device
locks in userland.  When I commit the update to libdrm, I will simultaneously
commit a new drm_atomic.h in the kernel.  The atomic ops there now
really do not merit the designation 'atomic'.
2008-04-30 07:09:48 +00:00
tnn
d3e1a14433 The "pkgsrc-i386" target doesn't seem to work on SunOS, so for now fall back
to the "pkgsrc" target which is intended to be portable.
2008-04-27 09:43:12 +00:00
tnn
f7c0145c22 Use full path to sysctl(8), an unprivileged user may not have /sbin in $PATH 2008-04-26 20:38:49 +00:00
joerg
89fb563488 s/MAKE_JOBS/MAKE_JOBS_SAFE/ 2008-04-25 20:49:13 +00:00
joerg
a77e7015fe Update PYTHON_VERSIONS_COMPATIBLE
- assume that Python 2.4 and 2.5 are compatible and allow checking for
fallout.
- remove PYTHON_VERSIONS_COMPATIBLE that are obsoleted by the 2.3+
default. Modify the others to deal with the removals.
2008-04-25 20:39:06 +00:00
bjs
3527d68c0d Welcome to Mesa-7.0.3.
Changes from 6.4.2 are (obviously) far too numerous to mention!  This
package brings with it support for the Direct Rendering Infrastructure
(DRI) on NetBSD-current; the kernel DRM was committed approximately
one year ago.  Patches for NetBSD 4.0 are available in the mailing list
archives (I think), but are _not supported_.

Developers and other interested parties are encouraged to read the TODO
file, as well as my remarks in options.mk.  There is still a significant
amount of work to be done.  Users of NetBSD/i386 (-current) shouldn't
have much trouble getting mainstream cards (Intel i915 and Radeon 9600-
R430 are by far the most tested) to work.

I have taken great pains to ensure that this works properly, but inevitably
there will be problems--especially on heretofore untested (read: non-x86)
hardware.  Your questions, comments, problem reports, and of course
bug fixes are welcome.

NOTE: There are currently problems (on NetBSD, at least) linking some
executables, e.g. compiz, due to unresolved symbols for libpthread
functions.  This is due to libX11's thread stubs, which should not
be enabled on NetBSD >= 2.0; see the TODO For more information
and the URL of an interim patch.
2008-04-24 07:40:23 +00:00
jlam
ae9b935fd0 * If PLIST_SRC is explicitly set to an empty value in a package Makefile,
then automatically generate a PLIST that says "${PKGNAME} has no files".

* If PLIST_SRC and GENERATE_PLIST are not set in a package Makefile,
  and no PLIST files exist, then fail during the package build with
  PKG_FAIL_REASON.

* Remove "intentionally empty" PLISTs again.

Now, the easy way to say that a package installs no files is to just
add the following to the package Makefile:

	PLIST_SRC=	# empty
2007-10-25 22:00:39 +00:00
jlam
38c496d6c0 Re-add "intentionally empty" PLISTs for meta-packages and other packages
that directly manipulate empty PLISTs.

Modify plist/plist.mk so that if the PLIST files are missing and no
GENERATE_PLIST is defined, then the package fails to build.
2007-10-25 17:49:45 +00:00
jlam
56ba4d2690 Remove empty PLISTs from pkgsrc since revision 1.33 of plist/plist.mk
can handle packages having no PLIST files.
2007-10-25 16:54:26 +00:00
seb
e60316b4fe As discussed on tech-pkg@ revert for now the last updates of the Mesa packages.
Downgraded graphics/MesaLib to 6.4.2nb3
Downgraded graphics/glu to 6.4.2
Downgraded graphics/glut to 6.4.2
Downgraded graphics/glx-utils to 6.4.2
Downgraded graphics/MesaDemos to 6.4.2
Downgraded graphics/Mesa to 6.4.2

Approved byg agc@.
2007-08-13 11:18:28 +00:00
adam
b6250536dc Changes 7.0.1:
New features:
* Added a bluegene-osmesa build config
Bug fixes:
* Added a few missing OpenGL 2.0 API entrypoints
* Fixed glDrawPixels(GL_STENCIL_INDEX) pixel transfer
* GLSL bug fix: added vec2(vec4) constructor
* GLSL bug fix: .strq and .rgba writemasks didn't always work
* Stencil pixel map didn't always work for glDrawPixels
* Fixed polygon stipple bug in i915 driver
* Binding a zero-sized texture didn't disable texturing
* Queries of GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH didn't include
  the terminating zero
* glXChooseFBConfig() in Xlib driver didn't handle GLX_STEREO flag properly
* Fixed a GLSL function call bug
* glPointParameteriv(GL_DISTANCE_ATTENUATION_EXT) didn't work
* glGetAttribLocation() always returned 1
* Fixed a few memory-related bugs in GLU library

Changes 7.0.0:
New features:
* OpenGL 2.0 and 2.1 API support.
Bug fixes:
* Fixed a few fog-related bugs.
* Fixed broken GLSL mix() function.
* Fixed broken GLSL exp() functions.
* Fixed GLSL mod4(vec4, vec4) bug.
* Implemented GLSL asin(), acos(), atan() functions.
* Fixed an R300 driver bug that caused Xorg composite manager to crash
* Fixed R300 vertex program/matrix bug
* GLSL dFdx() and dFdy() work for fragment program inputs now (texcoords)
* Specifying an invalid texture unit as a sampler could lead to a crash
* The GLX protocol request for glXDestroyPBuffer() was incorrect
* ARB vp state.light[n].half value was incorrect
* Fixed a positional light source bug
* Fixed point size attenuation problem
* glPopAttrib didn't restore texture object's LOD bias
* Fixed a TLS / TEXTREL problem
2007-08-12 15:14:46 +00:00
reed
b5a3a56776 Use MAKE_ENV when doing the libtool during the install.
This fixes failure to install MesaLibs package.
This is the same problem (but different package) as my PR #36020.
2007-03-19 16:47:43 +00:00
wiz
601583c320 Whitespace cleanup, courtesy of pkglint.
Patch provided by Sergey Svishchev in private mail.
2007-02-22 19:26:05 +00:00
rillig
5411b161ad Mesa isn't MAKE_JOBS_SAFE. 2007-01-18 10:24:45 +00:00
joerg
b28fb5fdd7 Switch to modular buildlinks. 2006-11-06 11:25:54 +00:00
joerg
f75176b39c Flag a number of packages I use as supporting (user-)destdir.
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".
2006-10-09 12:52:34 +00:00
jlam
396fe8e4c8 Split Mesa/Makefile.common into Makefile.common and Makefile.lib.
The latter is used by packages that build libraries from the Mesa
sources, while the former is only if the package builds from the Mesa
sources.  Modify the various Mesa packages to include the proper
Makefile, and add some documentation to the Makefiles.

As a side effect, this suppresses the "duplicate target" warning in
graphics/glx-utils that was caused by having the same distfile listed
in DISTFILES more than once.
2006-08-01 21:40:19 +00:00
markd
1c171cf26c Default INSTLIBS to "". Fixes PR pkg/31046 2006-07-06 14:12:31 +00:00
markd
953402e436 Remove some sunos5 BUILD_TARGET's that don't exist (any more).
Also use the pkgsrc BUILD_TARGET for Solaris on x86 - it does a better job
Fixes PR pkg/30581, pkg/30894, pkg/30895, pkg/30684 and pkg/32553.
2006-07-06 12:18:35 +00:00
reed
f57063984a Mention glx-utils distinfo if changing this version. 2006-06-13 23:48:45 +00:00
joerg
c654ac9119 Mesa needs C++ and makedepend. 2006-06-07 11:43:34 +00:00
jlam
9c8b5ede43 Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where no
developer is officially maintaining the package.

The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list).  Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.
2006-03-04 21:28:51 +00:00
adam
b5468d064f 6.4.2 February 2, 2006
New:
	- added OSMesaColorClamp() function/feature
	- added wglGetExtensionStringARB() function
    Bug fixes:
	- fixed some problems when building on Windows
	- GLw header files weren't installed by installmesa script (bug 5396)
	- GL/glfbdev.h file was missing from tarballs
	- fixed TNL initialization bug which could lead to crash (bug 5791)
2006-02-09 12:27:42 +00:00
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
adam
f1fb57c495 Changes 6.4:
New:
	- Added a fast XOR line drawing function in Xlib driver
	- Added support for GL_ARB_texture_mirrored_repeat to savage
	  driver (supported only on Savage4 hardware).
    Changes:
	- Mesa now packaged in three parts: Library, Demos and GLUT
    Bug fixes:
	- GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig
	- Some files were present multiple times in the 6.3.2 tarballs
	- r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207)
	- glxgears_fbconfig demo didn't work (bug 4237)
	- fixed bug when bilinear sampling 2d textures with borders
	- glXCreatePbuffer() could segfault instead of returning 0 (bug 4235)
	- fixed undefined frexp and rand in X.org libGLcore.a (bug 4242)
	- fixed a few problems with proxy color tables (bug 4270)
	- fixed precision problem in Z clearing (bug 4395)
	- glBitmap, glDraw/CopyPixels mistakenly generated selection hits
	- fixed potential segfault caused by reading pixels outside
	  of renderbuffer bounds
	- glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB
	- fixed memory corruption bug involving software alpha buffers
	- glReadPixels clipped by window bounds was sometimes broken
	- glDraw/CopyPixels of stencil data ignored the stencil write mask
	- glReadPixels from a texture bound to a framebuffer object didn't work
	- glIsRender/FramebufferEXT weren't totally correct
	- fixed a number of point size attenuation/fade bugs
	- fixed glFogCoord bug 4729
	- GLX encoding for transpose matrix functions was broken
	- fixed broken fragment program KIL and SWZ instructions
	- fragment programs that wrote result.depth.z didn't work

Changes 6.4.1:
    Bug fixes:
	- redefining a vertex program string didn't take effect in TNL module
	- fixed occasional segfault upon vertex/fragment parsing error
	- vertex program LIT instruction didn't handle 0^0=1 correctly
	- fragment program fog option didn't work with glDrawPixels, glBitmap
	- USE_MGL_NAMESPACE didn't work for x86-64
	- OSMesa demos were missing from previous release tarballs
	- fixed problem with float->ushort conversion in glClear (bug 4992)
	- popping of GL_EYE_PLANE texgen state was broken (bug 4996)
	- popping of GL_SPOT_DIRECTION light state was broken (bug 5005)
	- fixed occasional triangle color interpolation problem on VMS
	- work around invalid free() call (bug 5131)
	- fixed BSD X server compilation problem by including stdint.h
2006-01-19 12:53:17 +00:00
tv
924b25bc16 Create template config file for Interix 3.x.
As part of this, do something special for xmesaP.h:  Because XShm.h does
exist on the Interix platform, and Mesa binaries were already buildable,
preserve the ABI by including XShm.h there and keeping the XShmSegmentInfo
field (with -DUSE_XSHM_HDRONLY) -- thus avoiding both flag day and revbump
sweep.  However, all XShm-using code remains turned off (no -DUSE_XSHM)
so that libGL will work.

Bump PKGREVISION of MesaLib only.
2005-11-08 16:41:30 +00:00
rillig
ff0764a7d0 Removed deprecated NO_PATCH. 2005-09-28 22:22:25 +00:00
jlam
abdc155ccd Fix variable names to start with "BUILTIN_FILES_" as expected by the
find-files.mk fragment.  This fixes the version number detection for
Mesa, XFree86, and X.org.
2005-06-20 22:13:10 +00:00
jlam
81edaaa606 Create directories before installing files into them. 2005-06-16 06:57:37 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
jlam
a6fed947f8 We don't need egrep since we're using a basic RE. 2005-04-30 02:16:12 +00:00