Commit graph

68 commits

Author SHA1 Message Date
danw
b65724482c Fix up some Makefile logic that got broken by the libtool patches (and
prevented it from building on some platforms). Ensure that the built
library is named libtk84 (as opposed to libtk8.4) on all platforms.
2004-04-09 23:39:00 +00:00
jlam
98196bcc44 Fix tcl/tk configure script stupidity: it overwrote the value of LDFLAGS
that accumulates within itself with a do-nothing version because it tried
to re-use LDFLAGS for another purpose.  This broke all library checks after
the "checking for ELF" step.  Fix this by (duh) not re-using LDFLAGS but
by using a different variable.  Bump the PKGREVISIONs of lang/tcl and
x11/tk.

This fixes building the threaded versions of tcl and tk.
2004-03-25 22:49:14 +00:00
jwise
0b05178f11 Now that we build tcl/tk with thread safety enabled, pull pthread buildlink
glue into the tcl buildlink glue.

Also, update buildlink dependencies appropriately.

Pointed out by wiz@netbsd.org.
2004-03-24 15:24:36 +00:00
jwise
73345802b3 Build thread-safe versions of tcl and tk. Bump PKG_REVISION to nb1 to match. 2004-03-22 16:14:02 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 09:12:08 +00:00
minskim
a3c0d62315 Keep library names on IRIX and Linux to be same as on other platforms. 2004-03-11 01:27:05 +00:00
minskim
9c121e17ff Update Tcl/Tk to 8.4.6.
* Tcl_Obj sharing fixed in [binary scan]
  * Updated errno usage for recent glibc
  * Fixed [file normalize ~unknownuser] error
  * Fixed two memory leaks in VFS code
  * Fixed possible infinite loop in TclFinalizeFilesystem
  * Updated HP-UX 11 build libraries setup
  * Unix std channels forced to exist at startup
  * Stopped broken [exec] quoting of '{'
  * Fixed memory leak with very long host names
  * Corrected level interpretation of Tcl_CreateTrace
  * Allow 64-bit configure on IRIX64-6.5*
  * Several OS X/Aqua native integration improvements (scrollbar,
    event generate, unicode clipboard, tk_messageBox, mousewheel event,
    alpha blending for partially transparent images)
  * Recognized native hand2/fleur cursors on Windows
  * Post menubuttons so they stay on screen better
  * Fixed crash during intra-image copy/resize
  * New msg catalogs for Esperanto and Polish
  * Corrections bold/italic font handling (width calculations) on Windows
  * Fixed shrinking grid geometry calculations
2004-03-08 22:14:18 +00:00
minskim
dc3bf1e6e1 Update tk to 8.4.5. Too many changes since 8.3.4. Please see
ChangeLog in the distfile.
2004-03-08 20:29:43 +00:00
minskim
ac690cf634 Replace lang/tcl with lang/tcl83. Packages compatible with 8.4 will
be updated to depend on lang/tcl after Tcl/Tk update.
2004-03-08 19:52:50 +00:00
jlam
9ff0e10340 Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 19:25:06 +00:00
minskim
2e42b35dac Remove a temporary directory created at post-install, so that a
non-root user can 'make clean'.  Approved by wiz@.
2004-02-09 23:19:27 +00:00
minskim
a89fef0347 Set permission of man directories correctly. Approved by wiz@. 2004-02-07 17:37:24 +00:00
jlam
a7d877ca6a Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files.  In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
2004-01-24 03:26:45 +00:00
agc
24a46ed346 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:28:26 +00:00
jlam
2c03f435c8 bl3ify 2004-01-05 11:17:10 +00:00
jlam
d279e6f535 Use S/+$// instead of C/\+$// to save a backslash. Very highly
recommended by seb :)
2004-01-05 11:05:44 +00:00
jlam
47bb2aae5f Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. 2004-01-04 23:34:04 +00:00
jlam
339cd13cb2 Initial sprinkling of work-in-progress buildlink3.mk files for using the
buildlink3 framework.
2004-01-03 23:06:43 +00:00
grant
ca3be631f2 s/netbsd.org/NetBSD.org/ 2003-07-17 22:50:55 +00:00
agc
6eacd3982c Some packages check for tclsh and wish rather than using other means of
testing for the presence or absence of tcl or tk, so add these to the
files managed by buildlink2.
2003-07-09 14:04:06 +00:00
jmmv
f1446ddf2b Drop trailing whitespace. Ok'ed by wiz. 2003-05-06 17:40:18 +00:00
grant
afdebcf9a4 make ${PAX} usage consistent:
- group 'zrw' and 'p' args, -s last
- use the && operator consistently
- strip unneeded parens
- some whitespace cleanup
2003-04-10 01:28:03 +00:00
jmmv
0916498c1b Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz. 2003-03-29 12:40:00 +00:00
jschauma
a241275f33 On Linux, this used to create libtk8.3.4 - let's use nodots here, too,
so we don't need to change the PLIST.
2003-03-16 18:37:43 +00:00
dillo
5f4ad95078 convert to use test target from bsd.pkg.mk
addresses PR pkg/19416
2003-02-17 15:27:58 +00:00
wiz
2d33188e49 Set USE_X11 to YES. Fixes tcl-itcl build. 2003-01-04 20:59:22 +00:00
wiz
f0053e23ec Unused. 2002-10-25 09:26:43 +00:00
jlam
c1ea81378b Make "-ltk" resolve into "-ltk83", so that we don't need to patch so
many Makefiles.
2002-09-21 10:30:58 +00:00
jlam
6f94b4e132 Define commonly-used location for tkConfig.sh as TKCONFIG_SH. 2002-08-29 17:20:21 +00:00
jlam
e2afa97f51 Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
2002-08-25 18:38:05 +00:00
jlam
fc477d50ab Touch a few files that are modified as part of post-build so that they're
not rebuilt at install-time.  This fixes buildlink leakage for tk noted in
pkg/15794.
2002-03-20 17:38:23 +00:00
tron
12784a0b2b Update patch with diffs for a regenerated "configure". This restores the
Solaris fixes which got lost in the recent update.
2002-01-05 23:47:19 +00:00
bjoern
6000f15f92 Update to version 8.3.4
Taken from "changes" from the distribution (minus changes not
relevant for NetBSD):


2001-04-04 (doc fixes) numerous doc corrections and clarifications.
Update of READMEs.

2001-04-04 (bug fix) corrected reseting of service mode to only occur when
it was set (hedin, hobbs)

2001-04-02 (bug fix) Checked for menu deletion before calling associated
menu entry command. Fixed listbox, canvas and entry destruction to be
more aware of current widget activity. (hobbs)

2001-03-30 (bug fix) handled the error case where a valid-looking but
invalid identifier could be passed in certain event generate options
causing a crash (hobbs)

2001-03-29 (bug fix) corrected handling of drag-selection (dejong)

2000-10-27 (feature enhancement) made [tk useinputmethods 1] the default
for Tk (hobbs)

2000-09-29 (bug fix) corrected BadMatch errors when using Tk on multiple
screens (hipp)

2000-08-18 (feature enhancement) Removed redundant call to DitherInstance
(melski)

2001-08-24 (bug fix) correct several possible free memory reads and array
bounds read errors reported by purify. (hobbs)

2001-08-27 (new feature) added call to Tcl_SetMainLoop which enables Tk to
be loaded interactively into tclsh and have the event loop kick in
correctly. (hobbs)

2001-08-28 (bug fix) fixed tk_chooseDirectory crash on Win95. (baker)

2001-08-28 (bug fix) removed 2 second 'raise' delay seen by some Unix
window managers. (hobbs, baker)

2001-09-14 (bug fix) fixed memory leaks that occured if errors were
thrown while initializing the channel for an image. (darley)

2001-10-04 (new feature) added enhanced bgerror dialog from Hipp. (hobbs)

2001-10-17 (bug fix) fixed file filtering in the motif file dialog (nelson)
2001-12-23 17:11:30 +00:00
jlam
28dc06397c Create ECHO_BUILDLINK_MSG for printing buildlink diagnostics. It's just
set to '${ECHO_MSG} "=>"' for now.
2001-11-30 17:21:54 +00:00
hubertf
5542206cba Get rid of manually adding "nbX" to PKGNAME when a pkg was changed in
pkgsrc. Instead, a new variable PKGREVISION is invented that can get
bumped independent of DISTNAME and PKGNAME.

Example #1:
        DISTNAME=       foo-X.Y
        PKGREVISION=    Z
     => PKGNAME=        foo-X.YnbZ

Example #2:
        DISTNAME=       barthing-X.Y
        PKGNAME=        bar-X.Y
        PKGREVISION=    Z
     => PKGNAME=        bar=X.YnbZ (!)

On subsequent changes, only PKGREVISION needs to be bumped, no more risk
of getting DISTNAME changed accidentally.
2001-11-29 01:12:24 +00:00
zuntum
d3db18607d Move pkg/ files into package's toplevel directory 2001-10-31 22:03:21 +00:00
jlam
a4bc16d30c I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use.  Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
2001-10-24 22:10:43 +00:00
jlam
dff59f9ec3 x11.buildlink.mk needs to be included before any buildlink.mk files that
use X11_BUILDLINK_MK as a test value.  Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.
2001-10-23 13:14:43 +00:00
jlam
936b41aaa1 Create private variables _TCLCONFIG_SED and _TKCONFIG_SED that hold the
sed expression used to convert tclConfig.sh and tkConfig.sh into forms
usable by buildlink.
2001-10-23 13:02:11 +00:00
jlam
312a13a191 Strongly-buildlinkify. 2001-10-23 09:57:30 +00:00
jlam
2c350496d6 Use -Wl,-R instead of -Wl,-rpath as the former is more consistent with the
rest of pkgsrc.
2001-10-23 09:55:47 +00:00
tron
cead56e675 Use the library naming scheme under Solaris as under NetBSD. While it's
not really necessary to strip dots from library names under Solaris it
makes the packages more compatible which should ease maintenance.
2001-07-29 07:54:56 +00:00
jlam
d2eb68d2a6 Add dir_DEFAULT setting used by EVAL_PREFIX logic to set the default
installation directory in case the package isn't installed.
2001-07-27 13:33:18 +00:00
jlam
1934a5ae41 In buildlinked *Config.sh files, substitute ${BUILDLINK_DIR} for
${LOCALBASE} in *_PREFIX definition.
2001-07-23 12:34:32 +00:00
jlam
dd30dabc8c Mechanical changes to buildlink.mk files to use EVAL_PREFIX to set
BUILDLINK_PREFIX.<pkgname>.  This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed.  Idea by Alistair Crooks <agc@pkgsrc.org>.
2001-07-20 01:54:51 +00:00
jlam
cb76bd5efc Move inclusion of bsd.buildlink.mk to start of file. 2001-07-01 22:59:08 +00:00
jlam
257758c1da Don't install the short names for section 3 manpages as the names are
too generic.  Approved by jwise@netbsd.org.
2001-06-30 18:39:29 +00:00
jlam
34d11d8a0f Generalize how the dependency pattern may be specified. Instead of just
FOO_REQD=1.0 being converted to foo>=1.0, one can now directly specify
the dependency pattern as FOO_DEPENDS=foo>=1.0.  This allows things like
JPEG_DEPENDS=jpeg-6b, or fancier expressions like for postgresql-lib.
Change existing FOO_REQD definitions in Makefiles to FOO_DEPENDS.
2001-06-23 19:26:48 +00:00
jlam
b62e28495f Add buildlink.mk files for use by other package Makefiles. 2001-06-21 21:41:34 +00:00
jlam
521487c367 Touch ${TK_LIB_FILE} during build so that it doesn't have to be re-linked
during installation.
2001-06-21 20:16:26 +00:00