Commit graph

39 commits

Author SHA1 Message Date
rillig
ea12600460 Append to CFLAGS and CPPFLAGS instead of overwriting. 2005-10-23 18:30:52 +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
wiz
a8b8039f7b Update to 1.2.6nb2:
Fix MIDI playback. Remove configuration option that defaults to yes.
From ISIHARA Takanori in PR 30330.
2005-06-01 14:11:26 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
wiz
1f2ba12d0f PKGREVISION bump for glut dependency removal (SDL/buildlink3.mk). 2005-03-27 15:43:32 +00:00
agc
71c8259803 Add RMD160 digests to the SHA1 ones. 2005-02-23 20:39:42 +00:00
uebayasi
a03f164f3d Fix quoting. 2005-02-14 08:16:35 +00:00
adam
7b3c35537d Changes 1.2.6:
* Added support for using the system version of libmikmod
* Added SDL_RWops support for reading Ogg Vorbis files
* Added 4 and 6 channel surround sound output support
* Added support for RMID format MIDI files
* Improved timidity support (reverb, chorus, Roland & Yamaha sysex dumps, etc.)
* Fixed bug with MIDI volume in native Windows playback
* Added SDL_RWops support for reading MOD files
2005-01-05 12:20:37 +00:00
adam
b47b288ca2 Fixed buildlink problems 2004-10-20 10:55:46 +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
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-22 08:09:14 +00:00
manu
e84550e71c Enable ogg music (needed for upcoming games/wesnoth package) 2004-07-14 13:16:30 +00:00
grant
e0ed05cfdb move smpeg to multimedia/ 2004-06-26 09:16:10 +00:00
reed
620d5f0066 Include the package name in this +DISPLAY. (When installing another
package, I saw this message about "To make use of the MIDI
capabilities" but didn't know what package it was for.)

And also remove "pkgsrc/" from the package names (since could be
done with binary packages too).
2004-05-12 18:38:07 +00:00
salo
9ba8196a22 Follow libogg into multimedia/. 2004-04-12 23:15:01 +00:00
snj
942709fc6f No longer used. 2004-04-12 00:19:50 +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
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
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
jlam
1b2674fcd7 The BUILDLINK_DEPENDS.<pkg> lines should match between the buildlink3.mk
and any pre-existing buildlink2.mk files.
2004-02-10 20:45:01 +00:00
jlam
75f431d969 PKGLIBTOOL and PKGSHLIBTOOL are no more. 2004-02-08 03:00:29 +00:00
snj
c8fdf481db Add a MESSAGE that tells users to install audio/eawatches (or guspatches)
if they want to play MIDI files with SDL_mixer.

Okayed by wiz.
2004-02-07 01:22:35 +00:00
skrll
0c157532de The long awaited update libtool to 1.5.2.
Some pkgsrc things
	- Fix PLISTs for packages that use -release
	- Include canonicalisation of a couple of paths for the benefit
	  of qt3-*
	- the normal version=sunos patching
	- fix all library_names_spec for the standard set of symlinks

The libtool things some of which had already made it into pkgsrc libtool.

New in 1.5.2: 2004-01-25; CVS version 1.5.0a, Libtool team:
* lt_dlrealloc is an official part of the libltdl API.
* --tag, --silent and --debug options are preserved and reused when libtool
  calls itself for relinking etc.
* `-pthread' and similar options are honoured when linking shared libraries.
* -no-suppress in compile mode shows compiler output for both PIC and non-PIC
  object compilation.
* New link mode option `-precious-files-regex' to prevent accidental removal
  of files you want to keep, such as test coverage data, from the temporary
  output directory.
* Directories specified in /etc/ld.so.conf are no longer hardcoded on Linux.
* Recognises the 'R' symbol type on Solaris so read-only symbols can be
  exported.
* Bug fixes.

New in 1.5: 2003-04-14; CVS version 1.4e, Libtool team:
* First stable release of multi-language architecture.
* libtool and libltdl support for Mac OS/X.
* libltdl will now use cygwins dlopen API instead of always forcing
  LoadLibrary.
* Support auto-import patch to binutils on cygwin for much improved dll
  support.
* Bug fixes.

New in 1.4.3: 2002-10-13; CVS version 1.4.2a, Robert Boehne:
* The libltdl subdirectory now bootstraps correctly with Automake 1.5.
* srcdir != builddir builds with Automake 1.5 work correctly.
* Support for mips-compaq-nonstopux.
* New command line argument, --preserve-dup-deps prevents removal of
  duplicate dependent libraries.

New in 1.4d: 2002-01-07; CVS version 1.4c, Libtool team:
* Help strings display correctly again.
* Better error messages when library linking fails.
* Better error messages from libltdl when loading fails.
* Better search path management in libltdl with `lt_dlinsertsearchdir' call.
* Support /lib/w32api in recent cygwin releases.
* Support cross compilation to mingw.
* Support for .rc files (Windows resource compiler).
* Improved handling of mingw gcc.
* Improved handling of $PATH with entries containing spaces.
* Improved support for linking with gcc on aix4* and aix5*.
* Improved support for GCC 3.0.
* Initial support for QNX RTOS, UnixWare 7 and OpenUNIX 8.
* Bug fixes to the OpenBSD port.
* Bug fixes.

New in 1.4.2: 2001-09-11; CVS version 1.4.1a, Gary V. Vaughan:
* libltdl now builds on solaris again
* diagnose and warn about not-quite-working combinations of gcc and
  ld on solaris.
* Improved OpenBSD support.
* Improved cygwin support.
* Bugfixes.

New in 1.4.1: 2001-09-03; CVS version 1.4.0a, Libtool team:
* Better error messages from libltdl when loading fails.
* Don't leave here-doc files behind.
* Improved support for OpenBSD.
* Libtool will build with autoconf-2.50 and higher.
* Plug memory management bugs in libltdl.
* Prefer shl_load to dlopen for better operation on HP-UX.

New in 1.4b: 2001-07-09; CVS version 1.4a, Libtool team:
* Now bootstraps with autoconf-2.50 and automake-1.4-p4.
* Always try to build at least a static lib, even if both static and
  shared libs were disabled.
* Full support for C++ compiler.
* Support for GNU gcj compiler.
* libltdl can now load all modules in a given path according to user
  supplied criteria with `lt_dlforeachfile' call.
* Improved support for AIX ia64, djgpp, HPUX, hurd, OpenBSD, sco3.2*.
* Internal mutex handling no longer has namespace clashes on NCR MP-RAS.
* New pdemo and tagdemo tests.
* Bug fixes.
2004-02-05 20:14:05 +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
jlam
2bef6db58f bl3ify 2004-01-05 22:44:04 +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
wiz
a6e105fbae Bump PKGREVISION for libogg (or, in 5 cases, libao) updates. 2003-12-08 14:41:38 +00:00
jmc
67625aceb4 regen 2003-08-01 21:35:43 +00:00
grant
8257275c8b fix multiline literals in configure script to appease gcc3.3.
from Jonathan Perkin in PR pkg/22294.
2003-07-30 17:21:06 +00:00
martti
ff0278ea30 COMMENT should start with a capital letter. 2003-07-21 16:24:36 +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
jschauma
e366d0c694 Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages.
Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.
2003-06-02 01:15:31 +00:00
salo
d37ae42670 Update to version 1.2.5.
Based on a patch sent by Soren Jacobsen via PR pkg/21525.

Changes:

- handle the patching in a simpler way
- style nits

1.2.5:
======
- Worked around MacOS X deadlock between CoreAudio and QuickTime
- Fixed crash in native midi code with files with more than 32 tracks
- Added 8SVX format support to the AIFF loader
- Fixed volume control on WAVE music chunks
- Fixed volume control on MOD music chunks
- Added support for the Atari platform
- Patch from Steven Fuller to fix panning effect with 8-bit sounds.
- Patch from guy on 3DRealms forums to fix native win32 midi volume.
- Small, looping music samples should now be able to fade out correctly.
- Added shared library support for MacOS X
- Correctly report an error when using an unknown filetype
- Added support for loading Ogg Vorbis samples as an audio chunk
- Fixed to start playing another sample immediately when one finishes
- Fixed a volume bug when calling Mix_HaltChannel() on unused channel
- Fixed volume reset bug at end of channel fade.
- Mix_LoadMUS() will now accept an MP3 by file extension, instead of relying
  entirely on the magic number.
2003-05-11 02:23:18 +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
27baada96e Add CONFLICTS line for SDL-mixer. 2003-04-05 19:04:38 +00:00
wiz
1d0fca28fb Re-import SDL-mixer as SDL_mixer (original name). 2003-04-03 08:17:21 +00:00