| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
only necessary because PKG_DESTDIR_SUPPORT must be defined before
bsd.prefs.mk is included.
|
|
take precedence.
|
|
databases/sqsh
databases/sqsh-motif
databases/sqsh-x11
The latter two are now just databases/sqsh built with a specific set of
options. Changes include:
+ Add options.mk that supports three options:
sqsh-motif Motif GUI
sqsh-xaw Athena GUI
sybase-openclient Use real Sybase
Note that USE_SYBASE_OPENCLIENT is a legacy variable for the new
global "sybase-openclient" option.
+ Remove Makefile.common and move all logic into sqsh/Makefile and
sqsh/options.mk.
+ Remove section in patch-aa that tried to deal with termcap/curses
issues for readline. That is now automatically taken care of in
pkgsrc through termcap.buildlink3.mk, which is included here
indirectly by readline/buildlink3.mk.
+ Add full DESTDIR support.
+ Bump the PKGREVISION for sqsh, sqsh-motif and sqsh-x11 to 5. All
three packages now track and use the same PKGREVISION number.
|
|
|
|
|
|
path to the buildlink files. This is due to changes I made to the freetds
installation.
Fix "man" to PKGMANDIR while I am here.
Bump PKGREVISION for all three packages (as the location
of libct is uses is different due to the freetds change).
I didn't test sqsh-motif packaging, as I couldn't get openmotif
to build at this time.
|
|
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.
|
|
|
|
Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), it
is intended as a replacement for the venerable 'isql' program supplied
by Sybase. It came about due to years of frustration of trying to do
real work with a program that was never meant to perform real work.
Sqsh is much more than a nice prompt, it is intended to provide much of
the functionality provided by a good shell, such as variables,
redirection, pipes, back-grounding, job control, history, command
completion, and dynamic configuration. Also, as a by-product of the
design, it is remarkably easy to extend and add functionality.
This package enables X11 support.
|
