The NetBSD Project

CVS log for pkgsrc/pkgtools/xpkgwedge/Attic/Makefile

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / pkgtools / xpkgwedge

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.84, Mon Aug 17 08:15:40 2015 UTC (7 years, 5 months ago) by wiz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.83: +1 -1 lines
FILE REMOVED

Remove xpkgwedge, not needed any longer.

Revision 1.83 / (download) - annotate - [select for diffs], Thu Oct 9 14:06:51 2014 UTC (8 years, 3 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4
Changes since 1.82: +1 -3 lines
Diff to previous 1.82 (colored)

Remove pkgviews: don't set PKG_INSTALLATION_TYPES in Makefiles.

Revision 1.82 / (download) - annotate - [select for diffs], Mon Mar 3 02:17:47 2014 UTC (8 years, 11 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1
Changes since 1.81: +2 -4 lines
Diff to previous 1.81 (colored)

Just define PKGNAME.

Revision 1.81 / (download) - annotate - [select for diffs], Sat Apr 6 04:07:24 2013 UTC (9 years, 10 months ago) by rodent
Branch: MAIN
CVS Tags: pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2
Changes since 1.80: +2 -2 lines
Diff to previous 1.80 (colored)

"Definition of PKG_SKIP_REASON is deprecated. Use PKG_FAIL_REASON instead."

Revision 1.80 / (download) - annotate - [select for diffs], Tue Sep 11 23:19:40 2012 UTC (10 years, 4 months ago) by asau
Branch: MAIN
CVS Tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3
Changes since 1.79: +1 -2 lines
Diff to previous 1.79 (colored)

"user-destdir" is default these days

Revision 1.79 / (download) - annotate - [select for diffs], Sun Jun 6 03:45:17 2010 UTC (12 years, 8 months ago) by dholland
Branch: MAIN
CVS Tags: pkgsrc-2012Q2-base, pkgsrc-2012Q2, 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
Changes since 1.78: +2 -2 lines
Diff to previous 1.78 (colored)

Force-set ManPath on Debian in order to work around silly things Debian
ships in their imake templates, which otherwise result in pkgsrc man pages
landing in /usr/share/man. PR 38248 (and possibly others).

Revision 1.78 / (download) - annotate - [select for diffs], Sun Mar 21 16:29:42 2010 UTC (12 years, 10 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2010Q1-base, pkgsrc-2010Q1
Changes since 1.77: +2 -2 lines
Diff to previous 1.77 (colored)

Reset maintainer, developer lost his commit bit.

Revision 1.77 / (download) - annotate - [select for diffs], Tue May 19 08:59:30 2009 UTC (13 years, 8 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2
Changes since 1.76: +2 -2 lines
Diff to previous 1.76 (colored)

Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENT
block). Uncomment some commented out LICENSE lines while here.

Revision 1.76 / (download) - annotate - [select for diffs], Thu Apr 9 00:48:14 2009 UTC (13 years, 10 months ago) by joerg
Branch: MAIN
Changes since 1.75: +1 -3 lines
Diff to previous 1.75 (colored)

Remove redundant NO_CHECKSUM and EXTRACT_ONLY definitions.

Revision 1.75 / (download) - annotate - [select for diffs], Sat Apr 12 22:43:09 2008 UTC (14 years, 9 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, cwrapper-base, cwrapper, cube-native-xorg-base, cube-native-xorg
Changes since 1.74: +7 -12 lines
Diff to previous 1.74 (colored)

Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.

Revision 1.74 / (download) - annotate - [select for diffs], Sun Dec 16 12:43:50 2007 UTC (15 years, 1 month ago) by tron
Branch: MAIN
CVS Tags: pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4
Changes since 1.73: +5 -3 lines
Diff to previous 1.73 (colored)

Fix build on pre-Leopard Mac OS X systems.

Revision 1.73 / (download) - annotate - [select for diffs], Sun Dec 16 12:29:17 2007 UTC (15 years, 1 month ago) by tron
Branch: MAIN
Changes since 1.72: +6 -4 lines
Diff to previous 1.72 (colored)

Mac OS X Leopard doesn't "InstallFlags" in "darwin.cf". We therefore don't
need to (and cannot) apply a patch to prevent that. This package builds
under Leopard now.

Revision 1.72 / (download) - annotate - [select for diffs], Sun Nov 11 11:35:50 2007 UTC (15 years, 2 months ago) by martti
Branch: MAIN
Changes since 1.71: +2 -1 lines
Diff to previous 1.71 (colored)

Added commented-out LICENSE=something.

Revision 1.71 / (download) - annotate - [select for diffs], Mon Oct 9 12:52:36 2006 UTC (16 years, 4 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4
Changes since 1.70: +12 -11 lines
Diff to previous 1.70 (colored)

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".

Revision 1.70 / (download) - annotate - [select for diffs], Wed Sep 27 15:18:15 2006 UTC (16 years, 4 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2006Q3-base, pkgsrc-2006Q3
Changes since 1.69: +3 -4 lines
Diff to previous 1.69 (colored)

Remove XFree86.

Revision 1.69 / (download) - annotate - [select for diffs], Sat Sep 9 20:31:46 2006 UTC (16 years, 5 months ago) by schwarz
Branch: MAIN
Changes since 1.68: +5 -1 lines
Diff to previous 1.68 (colored)


improve support for IRIX 5 working around some bad default settings

Revision 1.68 / (download) - annotate - [select for diffs], Thu Aug 3 17:35:12 2006 UTC (16 years, 6 months ago) by tv
Branch: MAIN
Changes since 1.67: +2 -3 lines
Diff to previous 1.67 (colored)

xpkgwedge is an in-pkgsrc tool; it doesn't use PKGREVISION.  Make it 1.16.

Revision 1.67 / (download) - annotate - [select for diffs], Wed Aug 2 20:26:15 2006 UTC (16 years, 6 months ago) by heinz
Branch: MAIN
Changes since 1.66: +3 -2 lines
Diff to previous 1.66 (colored)

On Linux the Imake files need gmake, so we do _not_ need MAKE but
IMAKE_MAKE replaced in pkgxmkmf.

Revision 1.66 / (download) - annotate - [select for diffs], Mon Apr 10 13:38:36 2006 UTC (16 years, 10 months ago) by schwarz
Branch: MAIN
CVS Tags: pkgsrc-2006Q2-base, pkgsrc-2006Q2
Changes since 1.65: +36 -1 lines
Diff to previous 1.65 (colored)


Modified xmkmf support for Darwin and IRIX:
- on Darwin, pkgsrc no longer tries to set user or group when installing
  as unprivileged user, i.e. with UNPRIVILEGED set to yes.
- on IRIX (5 and 6) the system's xmkmf config files are no longer modified.
  Instead copies (that take priority with pkgsrc's xmkmf) are used for that
  purpose.

Revision 1.65 / (download) - annotate - [select for diffs], Tue Mar 14 01:14:32 2006 UTC (16 years, 10 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2006Q1-base, pkgsrc-2006Q1
Changes since 1.64: +1 -3 lines
Diff to previous 1.64 (colored)

Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.

If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts.  If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:

	INSTALL_SRC=	${PKGDIR}/INSTALL
	DEINSTALL_SRC=	# emtpy

As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts.  By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).

In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework.  The only public variables relating to the templates are:

	INSTALL_SRC		INSTALL_TEMPLATE
	DEINSTALL_SRC		DEINSTALL_TEMPLATE
				HEADER_TEMPLATE

The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.

Revision 1.64 / (download) - annotate - [select for diffs], Thu Jan 12 19:02:34 2006 UTC (17 years ago) by joerg
Branch: MAIN
Changes since 1.63: +5 -2 lines
Diff to previous 1.63 (colored)

Add runtime dependency of xpkgwedge on imake and xmkmf.

When using non-native X11, xpkgwedge could be installed before imake
and host.def en up with just the xpkgwedge.def include. This means
that ProjectRoot as set by xorg's host.def is not used and wrong
path names are used. This run time dependency is the easiest way to
ensure proper order, but isn't perfect. Just providing a fixed host.def
and a secondary include file for Lesstif to modify breaks with
USE_XPKGWEDGE=NO, so keep the old approach.

Discussed with jlam@

Revision 1.63 / (download) - annotate - [select for diffs], Fri Jan 6 16:58:32 2006 UTC (17 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.62: +11 -4 lines
Diff to previous 1.62 (colored)

Use SUBST framework.

Revision 1.62 / (download) - annotate - [select for diffs], Thu Dec 29 06:22:06 2005 UTC (17 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.61: +1 -2 lines
Diff to previous 1.61 (colored)

Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.

Revision 1.61 / (download) - annotate - [select for diffs], Sat Dec 17 05:20:22 2005 UTC (17 years, 1 month ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q4-base, pkgsrc-2005Q4
Changes since 1.60: +2 -2 lines
Diff to previous 1.60 (colored)

Change my MAINTAINER email address to the one I've been using for
pkgsrc work.

Revision 1.60 / (download) - annotate - [select for diffs], Mon Dec 5 20:50:51 2005 UTC (17 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.59: +3 -3 lines
Diff to previous 1.59 (colored)

Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html

Revision 1.59 / (download) - annotate - [select for diffs], Wed Sep 28 20:52:25 2005 UTC (17 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.58: +3 -3 lines
Diff to previous 1.58 (colored)

Replaced "# defined" with "yes" in Makefile variables like GNU_CONFIGURE,
NO_BUILD, USE_LIBTOOL.

Revision 1.58 / (download) - annotate - [select for diffs], Tue Jun 14 20:12:51 2005 UTC (17 years, 7 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q3-base, pkgsrc-2005Q3, pkgsrc-2005Q2-base, pkgsrc-2005Q2
Changes since 1.57: +4 -2 lines
Diff to previous 1.57 (colored)

Update pkgtools/xpkgwedge to 1.14.  Changes from 1.13 include using
the make required by the imake config files, which is specified by
${IMAKE_MAKE}.  This allows differing make programs to be used for
the main build versus xmkmf.

Revision 1.57 / (download) - annotate - [select for diffs], Tue Jun 14 07:23:56 2005 UTC (17 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.56: +2 -3 lines
Diff to previous 1.56 (colored)

Update pkgtools/xpkgwedge to 1.13.  Changes from version 1.12 include
invoking the make(1) program as "make" instead of hardcoding the
(wrong) path in ${MAKE_PROGRAM}.  This will rely on the tools framework
to have set up "make" to properly call the correct make(1) program.
This should fix cases where pkgxmkmf called the wrong make(1) program
on Linux systems.

Revision 1.56 / (download) - annotate - [select for diffs], Wed Jun 1 18:03:08 2005 UTC (17 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.55: +3 -2 lines
Diff to previous 1.55 (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.55 / (download) - annotate - [select for diffs], Sat May 7 22:24:04 2005 UTC (17 years, 9 months ago) by wiz
Branch: MAIN
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (colored)

Refer doc/pkgsrc.html instead of Packages.txt (HOMEPAGE variable).

Revision 1.54 / (download) - annotate - [select for diffs], Mon Apr 11 21:47:06 2005 UTC (17 years, 9 months ago) by tv
Branch: MAIN
Changes since 1.53: +1 -2 lines
Diff to previous 1.53 (colored)

Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.

Revision 1.53 / (download) - annotate - [select for diffs], Fri Aug 27 06:29:10 2004 UTC (18 years, 5 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q1-base, pkgsrc-2005Q1, pkgsrc-2004Q4-base, pkgsrc-2004Q4, pkgsrc-2004Q3-base, pkgsrc-2004Q3
Changes since 1.52: +2 -3 lines
Diff to previous 1.52 (colored)

Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

Revision 1.52 / (download) - annotate - [select for diffs], Sat Jul 31 01:42:06 2004 UTC (18 years, 6 months ago) by xtraeme
Branch: MAIN
Changes since 1.51: +21 -3 lines
Diff to previous 1.51 (colored)

I don't know why, but using XFree86 or xorg from pkgsrc, doesn't get
the correct link flags, anyway adding ExtraLoadFlags seems to fix this.

Bump version to 1.12 (XFree86/xorg fix).

Revision 1.51 / (download) - annotate - [select for diffs], Tue Jun 15 02:27:10 2004 UTC (18 years, 7 months ago) by minskim
Branch: MAIN
CVS Tags: pkgsrc-2004Q2-base, pkgsrc-2004Q2
Changes since 1.50: +7 -3 lines
Diff to previous 1.50 (colored)

Let xpkgwedge to create a symlink ${PREFIX}/bin/mkfontscale, which is
required to install fonts/jmk-fonts and fonts/sgi-fonts with recent X.
Suggested by Kibum Han.

Also add mkfontscale to CONFLICTS because mkfontscale installs
bin/mkfontscale.

Bump PKGVERSION to 1.11.

Revision 1.50 / (download) - annotate - [select for diffs], Fri Apr 30 19:44:21 2004 UTC (18 years, 9 months ago) by tv
Branch: MAIN
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)

1.10: Add a chunk of shlib override make-code to make this work on Interix,
and patch site.def (but differently from how it is patched on OpenWindows).

Revision 1.49 / (download) - annotate - [select for diffs], Mon Feb 2 10:08:43 2004 UTC (19 years ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2004Q1-base, pkgsrc-2004Q1
Changes since 1.48: +2 -1 lines
Diff to previous 1.48 (colored)

These packages don't use any compilers, so set USE_LANGUAGES to an empty
value.

Revision 1.48 / (download) - annotate - [select for diffs], Tue Jan 20 12:23:58 2004 UTC (19 years ago) by agc
Branch: MAIN
Changes since 1.47: +2 -2 lines
Diff to previous 1.47 (colored)

Move WRKSRC definition away from the first paragraph in a Makefile.

Revision 1.47 / (download) - annotate - [select for diffs], Sun Jan 4 04:51:47 2004 UTC (19 years, 1 month ago) by reed
Branch: MAIN
Changes since 1.46: +2 -1 lines
Diff to previous 1.46 (colored)

Make sure LOCALBASE and X11BASE are defined before comparing them.
(Thank you, Takahiro.)

Revision 1.46 / (download) - annotate - [select for diffs], Sat Jan 3 23:51:08 2004 UTC (19 years, 1 month ago) by reed
Branch: MAIN
Changes since 1.45: +5 -1 lines
Diff to previous 1.45 (colored)

xpkgwedge is not needed when X11BASE is LOCALBASE,
so use PKG_SKIP_REASON. (Okay'd by jlam@).

(Next I need to make sure that MesaLib and Xrender are not installed
when using wip/XFree86-libs.)

Revision 1.45 / (download) - annotate - [select for diffs], Sat Jan 3 23:34:21 2004 UTC (19 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.44: +5 -2 lines
Diff to previous 1.44 (colored)

Update pkgtools/xpkgwedge to 1.9.  Changes from version 1.8 are making
this package work in a pkgviews world by looking for imake config files
in ${PREFIX}/lib/X11/config, then ${VIEWBASE}/lib/X11/config, then
${X11BASE}/lib/X11/config.  The second directory is where some packages
may share a commonly-editted host.def file.

Revision 1.44 / (download) - annotate - [select for diffs], Sun Nov 23 08:35:05 2003 UTC (19 years, 2 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2003Q4-base, pkgsrc-2003Q4
Changes since 1.43: +1 -3 lines
Diff to previous 1.43 (colored)

We're not ready for pkgviews yet!

Revision 1.43 / (download) - annotate - [select for diffs], Sun Nov 23 06:46:54 2003 UTC (19 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.42: +4 -1 lines
Diff to previous 1.42 (colored)

Update the host.def file during view (de)installation.  Also deal with
the font program symlinks at both view-deinstall and normal deinstallation
time since the files aren't listed in the PLIST (the font programs are
handled completely by the INSTALL/DEINSTALL scripts).

Revision 1.42 / (download) - annotate - [select for diffs], Sat Oct 18 10:12:09 2003 UTC (19 years, 3 months ago) by grant
Branch: MAIN
Changes since 1.41: +2 -2 lines
Diff to previous 1.41 (colored)

s,/usr/X11R6/,$${X11BASE}, in COMMENT.

yes, this deliberately does not expand ${X11BASE}, as that would
lead to the same confusion (X11R6 vs. openwin, etc.) when we use
this pkg's COMMENT on the web site/search.

Revision 1.41 / (download) - annotate - [select for diffs], Wed Sep 10 17:31:43 2003 UTC (19 years, 5 months ago) by gavan
Branch: MAIN
Changes since 1.40: +2 -4 lines
Diff to previous 1.40 (colored)

Add handling for OpenWin on Solaris. Two files are patched with
sed at install time which override the versions in the /usr/openwin
tree.

PREFIX no longer has a default value, as this relied on nonportable
BSD make syntax. Makefiles generated with pkgxmkmf will now always
need PREFIX set in the environment.

Revision 1.40 / (download) - annotate - [select for diffs], Sat Aug 30 22:51:29 2003 UTC (19 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.39: +5 -3 lines
Diff to previous 1.39 (colored)

Add definitions for DEINSTALL_EXTRA_TMPL and INSTALL_EXTRA_TMPL if
USE_PKGINSTALL is "YES".  bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.

Revision 1.39 / (download) - annotate - [select for diffs], Sat Aug 30 11:08:23 2003 UTC (19 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.38: +7 -38 lines
Diff to previous 1.38 (colored)

Modernize this package a bit:

* Use bsd.pkg.install.mk instead of supplying custom INSTALL/DEINSTALL
  scripts.

* Note that this package doesn't really use buildlink.

* Remove ancient BUILDLINK_DEPENDS= line at the bottom of the file that
  we no longer need since the buildlink1 days of yore.

Revision 1.38 / (download) - annotate - [select for diffs], Mon Jul 21 17:14:11 2003 UTC (19 years, 6 months ago) by martti
Branch: MAIN
Changes since 1.37: +2 -2 lines
Diff to previous 1.37 (colored)

COMMENT should start with a capital letter.

Revision 1.37 / (download) - annotate - [select for diffs], Thu Jul 17 22:52:20 2003 UTC (19 years, 6 months ago) by grant
Branch: MAIN
Changes since 1.36: +3 -3 lines
Diff to previous 1.36 (colored)

s/netbsd.org/NetBSD.org/

Revision 1.36 / (download) - annotate - [select for diffs], Thu Jun 12 15:34:38 2003 UTC (19 years, 7 months ago) by jschauma
Branch: MAIN
Changes since 1.35: +2 -1 lines
Diff to previous 1.35 (colored)

Use ${MAKE}, too.

Revision 1.35 / (download) - annotate - [select for diffs], Sat Mar 29 12:42:13 2003 UTC (19 years, 10 months ago) by jmmv
Branch: MAIN
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (colored)

Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

Revision 1.34 / (download) - annotate - [select for diffs], Fri Aug 23 05:23:00 2002 UTC (20 years, 5 months ago) by jlam
Branch: MAIN
CVS Tags: netbsd-1-6-1-base, netbsd-1-6-1
Changes since 1.33: +1 -1 lines
Diff to previous 1.33 (colored)

Merge pkgsrc/pkgtools from the buildlink2 branch back to the main trunk.

Revision 1.33 / (download) - annotate - [select for diffs], Fri Aug 23 04:22:43 2002 UTC (20 years, 5 months ago) by jlam
Branch: MAIN
CVS Tags: buildlink2-base
Changes since 1.32: +3 -1 lines
Diff to previous 1.32 (colored)

Merge pkgtools/xpkgwedge from the buildlink2 branch back into the main
trunk.

Revision 1.31.2.3 / (download) - annotate - [select for diffs], Sun Jun 23 18:57:51 2002 UTC (20 years, 7 months ago) by jlam
Branch: buildlink2
Changes since 1.31.2.2: +3 -1 lines
Diff to previous 1.31.2.2 (colored) to branchpoint 1.31 (colored) next main 1.32 (colored)

Merge from pkgsrc-current to buildlink2 branch.

Revision 1.31.2.2 / (download) - annotate - [select for diffs], Fri Jun 21 23:05:36 2002 UTC (20 years, 7 months ago) by jlam
Branch: buildlink2
Changes since 1.31.2.1: +2 -2 lines
Diff to previous 1.31.2.1 (colored) to branchpoint 1.31 (colored)

Rename USE_BUILDLINK2_ONLY to USE_BUILDLINK2 for less verbosity.  Also
convert a few more packages to use the buildlink2 framework.

Revision 1.32 / (download) - annotate - [select for diffs], Fri Jun 7 12:53:49 2002 UTC (20 years, 8 months ago) by tron
Branch: MAIN
CVS Tags: pkgviews-base, pkgviews, netbsd-1-6-RELEASE-base, netbsd-1-6
Changes since 1.31: +3 -1 lines
Diff to previous 1.31 (colored)

This package doesn't work under Solaris because the include OpenWindows
is based on a very old X11 release.

Revision 1.31.2.1 / (download) - annotate - [select for diffs], Sat May 11 02:09:21 2002 UTC (20 years, 9 months ago) by jlam
Branch: buildlink2
Changes since 1.31: +3 -1 lines
Diff to previous 1.31 (colored)

First pass at conversion of various packages to use the buildlink2
framework.  Add many buildlink2.mk files to add to the framework.  Please
see buildlink2.txt for more details.

Revision 1.31 / (download) - annotate - [select for diffs], Tue Feb 26 21:49:06 2002 UTC (20 years, 11 months ago) by jlam
Branch: MAIN
CVS Tags: netbsd-1-5-PATCH003
Branch point for: buildlink2
Changes since 1.30: +10 -5 lines
Diff to previous 1.30 (colored)

Symlink/remove bdftopcf, fstobdf, and mkfontdir in the INSTALL/DEINSTALL
scripts so that they are properly added and removed if xpkgwedge is
installed as a binary package.  Also, add some protection against the case
where ${X11BASE} == ${PREFIX} by checking this isn't true before removing
these font-manipulation programs.

Revision 1.30 / (download) - annotate - [select for diffs], Sun Oct 14 16:42:58 2001 UTC (21 years, 3 months ago) by tron
Branch: MAIN
Changes since 1.29: +5 -3 lines
Diff to previous 1.29 (colored)

Create links for X11 font tools so that packages building own fonts e.g.
the "xjewel" will build again. Bump version number to 1.7.

Revision 1.29 / (download) - annotate - [select for diffs], Sun Sep 9 20:36:43 2001 UTC (21 years, 5 months ago) by agc
Branch: MAIN
Changes since 1.28: +2 -2 lines
Diff to previous 1.28 (colored)

Deprecate NO_WRKSUBDIR, replacing it with an explicit assignment of:

WRKSRC= ${WRKDIR}

This is much cleaner, much more indicative of what happens, and removes
another of the negative definitions (NO_.* = value).

Revision 1.28 / (download) - annotate - [select for diffs], Fri Jul 13 07:09:22 2001 UTC (21 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.27: +2 -11 lines
Diff to previous 1.27 (colored)

In package Makefiles, create FILES_SUBST instead of duplicating sed
expression for substituting in DEINSTALL/INSTALL scripts.  Use "${CMP} -s"
instead of "diff -q" since the former is more portable across OSes.

Revision 1.27 / (download) - annotate - [select for diffs], Tue Jul 10 00:58:32 2001 UTC (21 years, 7 months ago) by hubertf
Branch: MAIN
Changes since 1.26: +2 -2 lines
Diff to previous 1.26 (colored)

bump version to 1.6 - work with host.def not existing on Solaris 8/x86

Revision 1.26 / (download) - annotate - [select for diffs], Mon Jul 2 21:03:02 2001 UTC (21 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.25: +2 -2 lines
Diff to previous 1.25 (colored)

Update xpkgwedge to 1.5.  This version factored out the buildlink logic
into a separate package (buildlink-x11) usable even without xpkgwedge
installed.

Revision 1.25 / (download) - annotate - [select for diffs], Sun Jul 1 21:13:21 2001 UTC (21 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)

Make sure the -DBuildLink gets passed through to subdir Imakefiles if
BuildLink is defined.  Bump xpkgwedge version number to 1.4 and increase
xpkgwedge dependency version in bsd.pkg.mk.

Revision 1.24 / (download) - annotate - [select for diffs], Fri Jun 29 18:27:30 2001 UTC (21 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)

Update xpkgwedge to 1.3.  Changes from version 1.2 are adding a section
triggered by the definition of "BuildLink" that forces ${BUILDLINK_DIR}
to be searched ahead of ${LOCALBASE} and ${X11BASE} for headers and
libraries.

Revision 1.23 / (download) - annotate - [select for diffs], Mon Jun 18 05:17:14 2001 UTC (21 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.22: +16 -9 lines
Diff to previous 1.22 (colored)

Use FILES_SUBST instead of repeating substitution pattern for all the
files, and substitute for a few more utilities instead of using unqualified
names for programs.

Revision 1.22 / (download) - annotate - [select for diffs], Sat Jun 16 08:53:48 2001 UTC (21 years, 7 months ago) by veego
Branch: MAIN
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

Add a local modified copy of InstallAppDefaultsLong:
 This is the same as the one in X11.tmpl, but without the LinkConfDirectory.
 LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11
 and creates a link to the real X11 app-defaults directory and moves the old
 app-defaults files into it. This is not what we want for pkgsrc.

This is for the people who use the real XFree86 version and not the one from
xsrc/xfree which has a NetBSD specific hack which breaks sharing /usr/X11R6.

Bump to version 1.2.

Revision 1.21 / (download) - annotate - [select for diffs], Thu May 31 10:25:21 2001 UTC (21 years, 8 months ago) by dent
Branch: MAIN
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Fix dead HOMEPAGE.

Revision 1.20 / (download) - annotate - [select for diffs], Sat Feb 17 17:51:35 2001 UTC (21 years, 11 months ago) by wiz
Branch: MAIN
CVS Tags: netbsd-1-5-PATCH001
Changes since 1.19: +2 -1 lines
Diff to previous 1.19 (colored)

Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.

Revision 1.19 / (download) - annotate - [select for diffs], Mon Jan 29 11:34:39 2001 UTC (22 years ago) by wiz
Branch: MAIN
Changes since 1.18: +1 -4 lines
Diff to previous 1.18 (colored)

Add automatic ${VARIABLE} handling for MESSAGE files.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.

Revision 1.18 / (download) - annotate - [select for diffs], Thu Jan 18 17:05:50 2001 UTC (22 years ago) by jlam
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)

Pull in a minor change to xmkmf from XFree86-4.0.2: xmkmf now supports
adding preprocessor definitions on the command line with -DVAR=var.
Update package version to 1.1.

Revision 1.17 / (download) - annotate - [select for diffs], Sat Jan 13 16:23:04 2001 UTC (22 years ago) by tron
Branch: MAIN
Changes since 1.16: +3 -3 lines
Diff to previous 1.16 (colored)

Fix typo in last commit.

Revision 1.16 / (download) - annotate - [select for diffs], Sat Jan 13 16:21:20 2001 UTC (22 years ago) by tron
Branch: MAIN
Changes since 1.15: +11 -3 lines
Diff to previous 1.15 (colored)

Use "gdiff" from "diffutils" package under Solaris.

Revision 1.15 / (download) - annotate - [select for diffs], Mon Oct 23 17:32:07 2000 UTC (22 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.14: +31 -18 lines
Diff to previous 1.14 (colored)

Update xpkgwedge to 1.0 and make appropriate changes to bsd.pkg.mk to handle
the new version of xpkgwedge.  Changes from xpkgwedge 0.4:

	* Redefine ImakeCmd to "imake -I$(PREFIX)/lib/X11/config" to
	  pick up X11 config files in $(PREFIX)/lib/X11/config before the
	  ones in the standard X11 tree.

	* Install a program called "pkgxmkmf" that's actually xmkmf, but
	  checks in $(PREFIX)/lib/X11/config before the standard X11 config
	  directory.

	* Create the host.def file in $(PREFIX)/lib/X11/config instead of
	  always in ${X11BASE}/lib/X11/config.

The benefits of this are:

	1) xpkgwedge can now install into $(PREFIX) instead of always into
	   $(X11BASE).

	2) Keeps the X11 tree "pure", and doesn't affect people who want
	   to run xmkmf and not include all the xpkgwedge stuff, even if
	   it's installed.

	3) Packages that install config files (lesstif, xview-config) can
	   now do so in $(PREFIX).

	4) People only have to use 'pkgxmkmf' instead of 'xmkmf', and
	   (hopefully) no other changes, if they want to use the config
	   files in xpkgwedge'd packages.

Revision 1.14 / (download) - annotate - [select for diffs], Fri Jul 14 04:22:41 2000 UTC (22 years, 6 months ago) by jlam
Branch: MAIN
CVS Tags: netbsd-1-5-RELEASE, netbsd-1-4-PATCH003
Changes since 1.13: +2 -1 lines
Diff to previous 1.13 (colored)

Add NO_MTREE so installation doesn't pollute X11BASE with a lot of
unnecessary, empty directories.

Revision 1.13 / (download) - annotate - [select for diffs], Wed Jun 28 15:02:32 2000 UTC (22 years, 7 months ago) by agc
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

Remove the user setting of the USE_LOCALBASE_FOR_X11 definition.
(Users can still set it if they want, but it won't make much
difference).

In bsd.pkg.mk, check for the presence of the xpkgwedge package to
determine whether to use LOCALBASE for X11 programs.  Set
_USE_LOCALBASE_FOR_X11 (an internal definition) if xpkgwedge is
installed. Remove BUILD_DEPENDS on xpkgwedge (it would always have
been true anyway).

Add a new X11PREFIX definition, which reflects the PREFIX for X11
packages, and set it to LOCALBASE or X11BASE accordingly.

Remove all references to USE_LOCALBASE_FOR_X11 from the xpkgwedge
package.

In all, make the installation of xpkgwedge a tad less clumsy.

Revision 1.12 / (download) - annotate - [select for diffs], Sun Sep 27 18:38:30 1998 UTC (24 years, 4 months ago) by tron
Branch: MAIN
CVS Tags: netbsd-1-4-RELEASE, netbsd-1-4-PATCH002, netbsd-1-4-PATCH001, netbsd-1-3-PATCH003, comdex-fall-1999
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

Add "pkgtools" to "${CATEGORIES}".

Revision 1.11 / (download) - annotate - [select for diffs], Thu Sep 17 15:47:09 1998 UTC (24 years, 4 months ago) by agc
Branch: MAIN
Changes since 1.10: +4 -5 lines
Diff to previous 1.10 (colored)

Make the REQ and MESSAGE files specifiable from package Makefiles,
as REQ_FILE and MESSAGE_FILE respectively.
Modify xpkgwedge to create its MESSAGE_FILE in the WRKDIR.

Revision 1.10 / (download) - annotate - [select for diffs], Sun Aug 23 21:25:19 1998 UTC (24 years, 5 months ago) by frueauf
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

Setting NO_CHECKSUM=yes is enough.

Revision 1.9 / (download) - annotate - [select for diffs], Sun Aug 23 21:18:24 1998 UTC (24 years, 5 months ago) by frueauf
Branch: MAIN
Changes since 1.8: +2 -1 lines
Diff to previous 1.8 (colored)

As there is nothing to extract, set EXTRACT_ONLY=#empty and remove
unnecessery md5 file.

Revision 1.8 / (download) - annotate - [select for diffs], Tue Aug 11 19:29:26 1998 UTC (24 years, 6 months ago) by tv
Branch: MAIN
Changes since 1.7: +5 -5 lines
Diff to previous 1.7 (colored)

Set ${PREFIX} after inclusion of bsd.pkg.mk; don't depend on bsd.pkg.mk to
conditionally set PREFIX.

Revision 1.7 / (download) - annotate - [select for diffs], Sun Aug 9 23:16:18 1998 UTC (24 years, 6 months ago) by tron
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

"make clean" shouldn't fail if nothing was built so far.

Revision 1.6 / (download) - annotate - [select for diffs], Fri Jul 31 19:30:49 1998 UTC (24 years, 6 months ago) by tv
Branch: MAIN
Changes since 1.5: +1 -3 lines
Diff to previous 1.5 (colored)

Make xpkgwedge capable of building a "binary pkg", for uniformity.

Revision 1.5 / (download) - annotate - [select for diffs], Fri Jul 31 15:00:41 1998 UTC (24 years, 6 months ago) by tv
Branch: MAIN
Changes since 1.4: +13 -6 lines
Diff to previous 1.4 (colored)

Update to "0.4": new layout to coincide with USE_LOCALBASE_FOR_X11
changes.

Revision 1.4 / (download) - annotate - [select for diffs], Tue Jul 14 10:56:16 1998 UTC (24 years, 6 months ago) by frueauf
Branch: MAIN
Changes since 1.3: +7 -3 lines
Diff to previous 1.3 (colored)

cat ${PKGDIR}/MESSAGE in bsd.pkg.mk if it exists, don't do it in every
package Makefile.

Revision 1.3 / (download) - annotate - [select for diffs], Wed Jul 1 15:56:35 1998 UTC (24 years, 7 months ago) by tv
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)

Update to "0.2": define ConfigDir in terms of $(X11_ROOT), so that imake
can be used recursively ("make Makefiles").

Revision 1.2 / (download) - annotate - [select for diffs], Fri Jun 26 16:41:11 1998 UTC (24 years, 7 months ago) by tv
Branch: MAIN
Changes since 1.1: +2 -3 lines
Diff to previous 1.1 (colored)

No need for both IS_INTERACTIVE and RESTRICTED; just put in RESTRICTED
with a suitable message.

Revision 1.1 / (download) - annotate - [select for diffs], Fri Jun 26 16:39:23 1998 UTC (24 years, 7 months ago) by tv
Branch: MAIN

Add xpkgwedge, an experimental patch that enables the build of X11 pkgs
(even imake ones) that will install in /usr/pkg instead of /usr/X11R6.
This is NOT (yet?) the standard X11 pkg build procedure, but it does
provide a "way out" for users that do not want to pollute their /usr/X11R6
tree with pkgs.

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>