| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
|
|
ships in their imake templates, which otherwise result in pkgsrc man pages
landing in /usr/share/man. PR 38248 (and possibly others).
|
|
|
|
block). Uncomment some commented out LICENSE lines while here.
|
|
|
|
through PLIST_SUBST to the plist module.
|
|
|
|
need to (and cannot) apply a patch to prevent that. This package builds
under Leopard now.
|
|
|
|
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".
|
|
|
|
|
|
|
|
|
|
IMAKE_MAKE replaced in pkgxmkmf.
|
|
- 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.
|
|
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.
|
|
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@
|
|
|
|
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
|
|
pkgsrc work.
|
|
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
|
|
NO_BUILD, USE_LIBTOOL.
|
|
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.
|
|
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.
|
|
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.
|
|
|
|
|
|
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.
|
|
the correct link flags, anyway adding ExtraLoadFlags seems to fix this.
Bump version to 1.12 (XFree86/xorg fix).
|
|
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.
|
|
and patch site.def (but differently from how it is patched on OpenWindows).
|
|
|
|
value.
|
|
|
|
(Thank you, Takahiro.)
|
|
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.)
|
|
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.
|
|
From Greg A. Woods. Fixes PR pkg/22957.
|
|
|
|
|
|
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).
|
|
provide a csh example as well as a bourne shell example.
|
|
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.
|
|
|
|
|
|
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.
|
|
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.
|
|
* 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.
|
