The NetBSD Project

CVS log for pkgsrc/pkgtools/x11-links/xfree.mk

[BACK] Up to [cvs.netbsd.org] / pkgsrc / pkgtools / x11-links

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.16 / (download) - annotate - [select for diffs], Fri Mar 20 19:25:13 2009 UTC (3 years, 2 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, HEAD
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

Revision 1.15 / (download) - annotate - [select for diffs], Fri Dec 15 20:33:00 2006 UTC (5 years, 5 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, cwrapper-base, cwrapper, cube-native-xorg-base, cube-native-xorg
Changes since 1.14: +6 -6 lines
Diff to previous 1.14 (colored)

Mechanically replace all includes of buildlink3.mk of the following
packages with the modular Xorg equivalent. Those are falling back
to the old location by default, so this commmit doesn't change
dependencies.

graphics/xpm ==> x11/libXpm
fonts/Xft2 ==> x11/libXft
x11/Xfixes ==> x11/libXfixes
x11/xcursor ==> x11/libXcursor
x11/Xrender ==> x11/libXrender
x11/Xrandr ==> libXrandr

Revision 1.14 / (download) - annotate - [select for diffs], Wed Apr 19 12:30:25 2006 UTC (6 years, 1 month ago) by reed
Branch: MAIN
CVS Tags: pkgsrc-2006Q3-base, pkgsrc-2006Q3, pkgsrc-2006Q2-base, pkgsrc-2006Q2
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

Update to change package names that have been changed.
(And add include of xproto buildlink3.mk for x.org.)
Increase package version to 0.29.

Revision 1.13 / (download) - annotate - [select for diffs], Thu Mar 23 13:46:31 2006 UTC (6 years, 2 months ago) by dmcmahill
Branch: MAIN
CVS Tags: pkgsrc-2006Q1-base, pkgsrc-2006Q1
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

avoid a malformed conditional with the make on netbsd-2.

Revision 1.12 / (download) - annotate - [select for diffs], Sun Oct 16 08:57:30 2005 UTC (6 years, 7 months ago) by seb
Branch: MAIN
CVS Tags: pkgsrc-2005Q4-base, pkgsrc-2005Q4
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

x11/render package had been moved as x11/renderext.

Revision 1.11 / (download) - annotate - [select for diffs], Wed Jun 1 18:03:08 2005 UTC (6 years, 11 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q3-base, pkgsrc-2005Q3, pkgsrc-2005Q2-base, pkgsrc-2005Q2
Changes since 1.10: +7 -6 lines
Diff to previous 1.10 (colored)

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.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Mar 29 05:43:32 2004 UTC (8 years, 1 month ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q1-base, pkgsrc-2005Q1, pkgsrc-2004Q4-base, pkgsrc-2004Q4, pkgsrc-2004Q3-base, pkgsrc-2004Q3, pkgsrc-2004Q2-base, pkgsrc-2004Q2
Changes since 1.9: +12 -9 lines
Diff to previous 1.9 (colored)

Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.

Revision 1.9 / (download) - annotate - [select for diffs], Thu Mar 11 00:47:01 2004 UTC (8 years, 2 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2004Q1-base, pkgsrc-2004Q1
Changes since 1.8: +3 -2 lines
Diff to previous 1.8 (colored)

Don't cat nonexistent files during the build.

Revision 1.8 / (download) - annotate - [select for diffs], Wed Mar 10 18:35:32 2004 UTC (8 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.7: +10 -17 lines
Diff to previous 1.7 (colored)

Catch up with removal of BUILDLINK_{IS,USE}_BUILTIN.

Revision 1.7 / (download) - annotate - [select for diffs], Tue Feb 17 16:50:26 2004 UTC (8 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.6: +3 -2 lines
Diff to previous 1.6 (colored)

Update to x11-links-0.23: catch up with Xft2/buildlink3.mk changes.

Revision 1.6 / (download) - annotate - [select for diffs], Tue Feb 17 08:26:25 2004 UTC (8 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.5: +3 -2 lines
Diff to previous 1.5 (colored)

Update pkgtools/x11-links to 0.22.  Changes from version 0.21 include
handling the built-in expat libraries and headers.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Feb 16 23:39:36 2004 UTC (8 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.4: +12 -2 lines
Diff to previous 1.4 (colored)

Update pkgtools/x11-links to 0.21.  Changes from version 0.20 include
catching up to changes to xcursor, Xrender, render, Xrandr, and randrext
by including their buildlink3.mk files.

Revision 1.4 / (download) - annotate - [select for diffs], Sun Sep 28 12:45:04 2003 UTC (8 years, 7 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2003Q4-base, pkgsrc-2003Q4
Changes since 1.3: +4 -1 lines
Diff to previous 1.3 (colored)

Document why we include the various buildlink3.mk files.

Revision 1.3 / (download) - annotate - [select for diffs], Sun Sep 7 19:40:42 2003 UTC (8 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)

Check that Mesa/GLU is builtin.

Revision 1.2 / (download) - annotate - [select for diffs], Sun Sep 7 19:30:23 2003 UTC (8 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1: +2 -1 lines
Diff to previous 1.1 (colored)

Add back the GLU files and some additional files in XFree86-4.3.x.

Revision 1.1 / (download) - annotate - [select for diffs], Tue Sep 2 07:14:44 2003 UTC (8 years, 8 months ago) by jlam
Branch: MAIN

Update pkgtools/x11-links to 0.13.  This package now uses buildlink3
to build.  I'm bumping the version number just in case the installed
package is different from version 0.12 (I can't test on different
systems).

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>