Commit graph

98 commits

Author SHA1 Message Date
jlam
7820875fff Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables.  Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.

For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
2005-08-10 20:56:10 +00:00
wiz
d774725534 Change path from devel/pkgconfig to devel/pkg-config.
No PKGREVISION bump since pkg-config is only a BUILD_DEPENDS.
2005-07-21 16:29:42 +00:00
jlam
95fd1f6ec9 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.
2005-06-01 18:02:37 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jlam
0fcc98108c Move buildlink3.mk files ahead of make targets, as in doc/Makefile-example. 2004-12-15 16:01:48 +00:00
jlam
609c937d41 JPilot's KeyRing plugin requires OpenSSL, so add the dependency by
including openssl/buildlink3.mk.  While we're here, also convert to
set USE_OLD_DES_API=yes and remove patch-ab, which was a workaround
for the OpenSSL DES problem.  Bump the PKGREVISION due to the dependency
change.
2004-12-15 16:00:23 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jmmv
bedae6c90c Make use of the new USE_DIRS variable, instead of directly depending on the
*-dirs packages.
2004-04-14 16:15:20 +00:00
minskim
38b5aec2f4 bl3ify and add explicit dependency on pkgconfig. 2004-02-14 18:43:43 +00:00
jlam
ec993afa1a LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
2004-02-14 17:21:32 +00:00
reed
6d9af8d68d Bump package revisions for tiff update.
Tiff is backward compatible, but was broken on amd64 platform
so this makes sure new tiff is used.
2004-01-03 18:49:33 +00:00
wiz
391b5798e6 Bump PKGREVISION for atk library major bump. 2003-12-13 00:45:21 +00:00
martti
e69ab8c365 COMMENT should start with a capital letter. 2003-07-21 16:35:12 +00:00
grant
91f00f1cbc s/netbsd.org/NetBSD.org/ 2003-07-17 21:21:03 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +00:00
wiz
7166660e08 Dependency bumps, needed because of devel/pth's major bump, and related
dependency bumps.
2003-05-02 11:53:34 +00:00
wiz
e99332c583 Update to 0.99.5, now using GTK2.
0.99.5 = 02/21/03
 Fixed serious bug resulting in overwriting appointments on the palm (Serious bug)
 Restore now restores latest files instead of ones from last backup (Critical bug)
 Added -export-dynamic to Makefile to resolve jp_logf unresolved errors
 Made home key go to today in datebook
 Added dialog error windows instead of logging them
 If files are to be installed a prompt window opens before a sync/backup
 Browser windows open from jpilot menu
 When app button is pressed it will cycle through categories

0.99.4 - 01/13/03
 Ported code to GTK-2 (I used GTK-2.2)
 Added random password generation to KeyRing
 Added a dialer program and GUI launcher
 Added Syncronization of categories and editing categories on desktop
 Added Export of iCalendar format from ToDo and Datebook
 Added Export of vCard format from Address book
 Added Export of ldif format from Address book
 Added Russian Language Support
 Removed jpilot-upgrade-99
2003-03-04 16:29:28 +00:00
rh
f46b160567 Update jpilot to 0.99.3. Changes include:
* Added Simplified Chinese translation
 * Added Traditional Chinese translation
 * Made dialog windows Modal
 * Manana support http://bill.sexton.tripod.com/download.htm
 * Changed code to keep unique IDs intact.
 * Support for OS 4.X passwords.
 * Better DateBk support
 * Pop up dialogs during the sync when different user name, null ID is
   found.
 * Lots of patches, bug fixes and minor improvements.
 * Made changes to support pilot-link 0.10.1 and USB
 * Export for Datebook, Address, Todo, and Memo
 * Import for Datebook, Address, Todo, and Memo
 * Can now enter begin/end times into datebook by GUI, or keyboard.
 * Put icons in clist title buttons.
 * Prompts to Save a changed/new record instead of letting it get away.
 * Drastically improved local database read speeds caused by bugs intro'd
   in 0.99
 * Fixed misc bugs in alarms.
 * Support for pedit (pedit is a memo editor for the palm).
 * Added Preferences to choose conduits.
 * Adding in better printing support.
 * Adding in record masking support.
 * Wrote a KeyRing plugin (KeyRing is a palm encryption app).
 * Added Restore Functionality.
 * Added plugin_startup & plugin_cleanup funcs to jpilot-sync.
 * Added man pages.
 * Added plugin_startup and plugin_cleanup to jpilot-sync.
 * Added a default pdb file for Expenses.
 * Added an icon when iconized.
2003-01-10 04:34:18 +00:00
salo
ab2818804e USE_PKGLOCALEDIR 2002-11-30 13:36:13 +00:00
jlam
01161e26b1 * buildlink1 -> buildlink2
* separate the INSTALL_DATA_DIR arguments into multiple commands, as the
  Solaris install can't handle lots of directories all at once
* style nits
2002-09-21 07:14:02 +00:00
wiz
80ee491886 Since the major of libiconv was increased during the update to 1.8,
bump dependency to latest libiconv version; recursively also bump all
dependencies of packages depending on libiconv.
Requested by fredb.
2002-09-10 16:06:32 +00:00
skrll
706e5e247d Remove need for a BUILD_DEPENDS on autoconf by providing a patch to the
configure script.
2002-02-13 22:15:54 +00:00
wiz
283fd7ee07 Bump PKGREVISION for additional installed file and man page changes. 2002-01-28 14:24:16 +00:00
wiz
20132483fb Mention html manual in man page, per pkg/15154.
Also install the BUGS file that's mentioned in the man page.
2002-01-28 14:23:39 +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
f79573370a Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
2001-09-27 23:17:41 +00:00
jlam
63fc151cb9 Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links.  These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
2001-08-29 22:41:00 +00:00
tron
a68a277b43 Use wildcard dependence on "autoconf" package. 2001-08-27 14:35:04 +00:00
jlam
3b65bde2f7 USE_CONFIG_WRAPPER is automatically set if USE_BUILDLINK_ONLY is defined,
so remove it from package Makefiles.  Also move the inclusion of the
buildlink.mk files to the end of the Makefile to just before bsd.pkg.mk
to ensure that any Makefile settings occur before the buildlink.mk files.
2001-06-29 04:54:49 +00:00
jlam
2d07461529 Convert to use pilot-link-libs' buildlink.mk files and mark as
USE_BUILDLINK_ONLY.
2001-06-27 18:07:53 +00:00
jlam
a91f432fa1 Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. 2001-06-22 05:59:58 +00:00
wiz
d480fe70ce Move BUILD_USES_MSGFMT in DEPENDS block, mostly by removing empty
lines.
2001-04-02 20:06:11 +00:00
hubertf
e32afb6fea Change BUILD_DEPENDS semantics:
first component is now a package name+version/pattern, no more
executable/patchname/whatnot.

While there, introduce BUILD_USES_MSGFMT as shorthand to pull in
devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current).

Patch by Alistair Crooks <agc@netbsd.org>
2001-03-27 03:19:43 +00:00
tron
40550e2c79 Add conflict with "jpilot-libplugin" package. 2001-03-01 21:40:20 +00:00
jlam
440c19af1d Update jpilot to 0.99. Changes from version 0.98.1:
Alphabetized 4 main app categories and expense categories
 New calendar begin/end setting method using keyboard
 jpilot-sync program added to allow command line syncing
 Made radio buttons for which phone # shows up in addr
 Made month/week views obey categories
 Made 4 main apps+expense more user friendly by detecting changes
 Added prefs for optionally backing up DBs
 Czech character set added
 Russian character set added
 Moved output screen to bottom panel in main window
 Fixed many bugs in Expense and improved GUI
 Fixed datebook entries showing weekly repeat
 Added a large view window to the monthview
 Fixed some DateBk3 bugs (templates showing as today, etc)
 Made Address screen stay as it was last used in quick/add view mode
 Alarms
 Sorted memos if they are sorted on the handheld
 Replaced calendar buttons (array) with a gtk_calendar widget
 Made Quickview a page on the address Notebook
 Made private records hidable using palm password
 Made changes for Japanese and Chinese and Korean and multibyte characters
 Included Synctime in rpm and made it detect and avoid PalmOS 3.3
 Made the creation of ~/.jpilot and ~/.jpilot/backup* perms 0700 & ~umask
  If upgrading then you may want to change the permissions of ~/.jpilot/ for
  security reasons.
 Made completed ToDos not print if hidden
 Minor postscript improvements
 Made plugin conduits selectable wether to sync or not
2001-03-01 20:38:14 +00:00
wiz
07cd20b334 Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-16 13:51:27 +00:00
itojun
53a3b2516e should not hardcode locale path, or it will choke on Solaris build 2000-11-09 14:17:06 +00:00
itojun
8b4007ad6f properly BUILD_DEPEND on gettext. add USE_LIBINTL.
workaround gettext.m4 bug.
2000-11-08 17:47:14 +00:00
tron
055f2e1692 Backout unintended change. 2000-11-08 13:15:38 +00:00
tron
a813c71726 Make sure that locale files go into the correct directory. 2000-11-08 13:11:16 +00:00
agc
78748d628a Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,
which takes entries of the format <make-definition-name>=<pkgname>. This
has not been added to MAKEFLAGS because (a) premature optimisation is the
root of all evil, and (b) because the .for loop used to implement this
shows the wrong results when multiple prefices are evaluated.

Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying
them considerably.

ALso simplify the logic to calculate the prefix as well.
2000-07-15 20:39:13 +00:00
agc
69cbb39071 The previous method of using a make target for finding a prerequisite
package's prefix would not work as part of the environment specification
via MAKE_ENV (as it would not be executed in the correct directory).

Fix this by invoking pkg_info(1) directly, not via an intermediate make(1)
step - this is not as clean, but more effective (i.e. it works).
2000-07-14 16:04:19 +00:00
agc
4aeac45f89 Make the determination of the pre-req package's installed directory be
a bit more user-friendly.

Introduce a show-{gtk+,imlib,kdebase,qt1,qt2,xpm}-prefix target in
bsd.pkg.mk, and use "${MAKE} show-*-prefix" in package Makefiles.
2000-07-11 14:53:35 +00:00
agc
e05e4735dd Hardcoding X11PREFIX into package Makefiles forces the user to install
xpkgwedge once, before any other packages have been installed, and
never to delete it.  This change finds the prefix of the installed
pre-req package using pkg_info(1), and allows packages to be found in
${X11BASE} and ${LOCALBASE}, not just ${X11PREFIX} - from mail from
Dave Sainty <dave@dtsp.co.nz>, munged slightly by myself.
2000-07-10 10:40:39 +00:00
agc
d951a0d54f Make this package xpkgwedge-safe by using the new X11PREFIX definition
in preference to X11BASE when trying to find the installed location of
X11 libraries, programs and headers (which will change if xpkgwedge is
installed).

[X11BASE reflects the location of the X11 libs, headers and programs.
X11PREFIX reflects the installed location of X11 packages.]
2000-06-30 10:04:46 +00:00
rh
c0f5618eec Fix plugin handling. 2000-06-15 21:14:06 +00:00
rh
34823d3224 Initial import of jpilot-0.98.1, a desktop organizer application for the
palm pilot.
2000-06-15 09:14:23 +00:00