Commit Graph

106 Commits

Author SHA1 Message Date
joerg
b757af438b Disable new -Wstring-plus-int warning where needed for now.
Adjust various places that add GCC-only options to check for the active
compiler first.
2012-04-04 10:59:44 +00:00
njoly
1d7281ae96 For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.
2012-01-17 19:40:08 +00:00
dholland
2a481dca6b Fix the setting of "xcbincludedir" in .pc files (where the xcb XML
files live) so that anything that needs to find them can. Fixes build
of pkgsrc libxcb, not that that in particular is terribly important.
2011-09-29 10:59:26 +00:00
apb
386a389aab Move all "clean" and "cleandir" processing to a new bsd.clean.mk
file, as proposed in tech-toolchain.
2011-09-10 16:57:35 +00:00
plunky
fa3d1b9a20 pcc cpp(1) does not understand the '-undef' and '-traditional' long form
arguments, use $(CC) -E instead of $(CPP) for these
2011-09-01 16:41:48 +00:00
mrg
e740c47eb7 updates for xorg-server 1.10.3 2011-08-02 07:44:39 +00:00
mrg
d4bb67a86f update to xorg-server 1.9.5 2011-07-24 01:40:40 +00:00
mrg
4cdc33f137 updates for freetype 2.4.5 2011-07-24 00:33:38 +00:00
dholland
5d43254f4a Fix the value of "appdefaultdir" that ends up in native X .pc files.
(It should be "app-defaults" but was "app-default", probably because
of a typo; it's been wrong ever since this logic was put in two and a
half years ago, and as app-defaults files are a legacy mechanism it
took this long for anyone to notice.) Should be pulled up to -5.
2011-07-03 22:59:46 +00:00
joerg
5e3fd2e02b Adjust --sysroot related usage:
-Wl,-rpath does not expand =, so just drop it.

Drop -Wl,-rpath-link entries that duplicate the -Wl,-rpath entries, this
is done implicitly now that ld is built with sysroot support.

Use ${DESTDIR} explicitly for the remaining -Wl,-rpath-link entries.
2011-04-11 23:03:38 +00:00
joerg
c033559e42 GCC 4.1 doesn't have the support code for -I =... yet, so don't use it
for now.
2011-04-11 21:04:11 +00:00
joerg
c28ff146c9 For USETOOLS=yes, use the --sysroot support of the compiler to cut down
the number of hard-coded pathes and magic invocations.
2011-04-10 16:52:36 +00:00
plunky
b34a9665c8 CLEANFILES is not processed by <bsd.files.mk> so don't assume that
anything assigned there will be cleaned up; handle clean up of the
PKGCONFIG files explicitly. (eg lib/dri/dri.pc was not cleaned)
2011-03-12 13:22:03 +00:00
joerg
d9da1368fc Don't depend on ${CC} passing down -R to ld, use -Wl,-rpath explicitly. 2010-12-08 01:57:22 +00:00
mrg
5efc132dce - always include <xorg-config.h> for DIX components
- update stuff to xorg-server 1.9.2
2010-11-23 09:49:30 +00:00
mrg
a69630cac3 add transforms for dri.pc. 2010-11-23 00:02:20 +00:00
yhardy
acec8b0574 Fix pkg-config substitution for glu 2010-10-22 16:48:38 +00:00
christos
0479cf6528 PR/43772: enami tsugutomo: __XCONFIGFILEMAN__ is left unexpaneded in
xinit(1)/startx(1)
2010-08-17 08:40:57 +00:00
mrg
7a40f55864 add/fix some transforms for some font, GL and xcb .pc files.
XXX: xcb still has pythondir=@pythondir@ in it.
2010-08-15 06:48:56 +00:00
mrg
8d81f5c19e add some more transforms to the hacky ugly sed script for pkg-config files,
and note a few more that are not yet handled but should be.
2010-07-18 07:05:39 +00:00
kiyohara
299d82b760 Support xserver for prep.
It tested only s3(864).
2010-07-12 07:54:11 +00:00
mrg
b6aa233709 ugh. this needs a real fix, but for now just update it to reality.
the diff -u is more obvious than a description:

-X11FLAGS.VERSION=      -DOSMAJORVERSION=1 -DOSMINORVERSION=6           # XXX
+X11FLAGS.VERSION=      -DOSMAJORVERSION=5 -DOSMINORVERSION=99          # XXX
2010-06-17 03:10:21 +00:00
joerg
2d399c649e Needs additional single quotes to keep the double qoutes. Magic... 2010-06-03 10:08:34 +00:00
joerg
826b0b1f17 XORGVERSION should be a single quoted expression as it represents a
single argument for .TH
2010-06-02 19:40:12 +00:00
veego
7f287d45d8 Remove a / between a ${DESTDIR}${X11USRLIBDIR} which would result in a
double /
2010-05-23 21:23:59 +00:00
nonaka
7ed8bf295b The support of X for zaurus is added. 2009-12-13 05:04:36 +00:00
tron
840a46601a Enable Stack Smash Protection (SSP) by default for NetBSD/amd64 and
NetBSD/i386 as previously discussed on the "port-amd64" and
"port-i386" mailing lists. No objections from the core team.

Thanks a lot to Tobias Nygren for helping me with the benchmarking
and to Christos Zoulas for fixing SSP problems in cgd(4).
2009-11-11 16:35:45 +00:00
mrg
3ebc75ef44 update for xorg-server 1.6.5 2009-11-09 07:38:14 +00:00
mrg
207f7c3b4c update for xorg-server 1.6.3. 2009-08-22 01:41:03 +00:00
mrg
2f79d21a3f we have xorg 1.6.2 now. 2009-07-24 04:46:53 +00:00
mrg
6773cdf6e4 XORG_CURRENT_VERSION is now 1.6.2. 2009-07-09 07:30:17 +00:00
mrg
2e277c2d9d add transforms for new GLU, GLUT and xorg-server pkgconfig files. 2009-06-23 04:40:29 +00:00
mrg
74da3bca40 update XORG_VERSION_CURRENT.
update the pkgconfig sed script to handle newer pixman.

XXX: should make the pkgconfig sed script barf it it ends up leaving
XXX: behind something that looks like "@.*@", i think.
2009-06-11 05:34:22 +00:00
mrg
097191f1bd don't define FONTCACHE here any more, for Xorg. 2009-06-10 08:28:20 +00:00
bouyer
7e113f2eda Add support for X11FLAVOUR=xorg to NetBSD/alpha. Tested on PWS500
(ev56, handled as non-BWX by Xorg) and XP1000 (ev6, BWX). Also
tested by Rafael Ruiz on a AlphaStation 255 (thanks !).
non-PCI adapters are not supported; someone should make these work
as a wsfb device.
2009-01-24 17:24:52 +00:00
mrg
9c8df5ee67 - retire MKXORG from public use
- introduce X11FLAVOUR to choose src/x11 vs src/external/mit/xorg
  for the X11 to build if MKX11=yes is set.  it takes the values
  of either Xorg or XFree86.
- default to Xorg on alpha, i386, macppc, shark, sparc and sparc64
- remove MKXORG_WITH_XSRC_XSERVER, unused and never useful
2008-11-09 23:02:28 +00:00
apb
f46c1de7cb Use ${TOOL_SED} instead if plain sed in Makefiles. 2008-10-25 22:27:34 +00:00
apb
96230fab84 Use ${TOOL_AWK} instead of ${AWK} or plain "awk" in make commands.
Pass AWK=${TOOL_AWK:Q} to shell scripts that use awk.
2008-10-19 22:05:19 +00:00
cube
988ef44d13 Rework the way manual pages are handled.
- .man.pre files are treated just like .man files.
 - Makefiles are offered the choice of using sed or cpp for the
   transformation.  MKXORG will default to sed, MKX11 to cpp.
 - At least for now, versions of packages are not tracked individually.
2008-10-14 23:33:55 +00:00
cube
e8a45a91fe Play it safe and change the sed script so that -E isn't needed. 2008-09-15 18:21:48 +00:00
rtr
ec7c336281 replace XTHREAD_CFLAGS with _REENTRANT instead of _POSIX_THREAD_SAFE_FUNCTIONS
as is done in pkgsrc.
2008-09-15 08:05:19 +00:00
cube
cbc74b28eb Make sure pkgconfig files we install have RPATH directives.
${TOOL_SED} -E is authorized, right?  Right?
2008-09-15 02:37:54 +00:00
cube
b11433d4c1 Add logic to install pkgconfig files from X.Org sources. Initial idea from
Tyler Retzlaff.

No, this is not code I am going to be proud of.  Meanwhile, anyone is
welcome to work on a mknative-xorg script and make sure that outputs across
all archs are consistent, and use it to generate a bunch of other stuff such
as the Imake config file and so on.  That will do for now though.
2008-09-13 04:28:37 +00:00
lukem
935f649468 Define __appmansuffix__=1 in the man page cpp(1) translation. 2008-09-07 14:29:38 +00:00
rtr
a51f302f6a add XLOCALE.DEFINES for locale path defs, easier to manage them here
than deep in the reachover.
2008-09-07 13:10:22 +00:00
lukem
5efefa3743 Force a failure if both MKX11 and MKXORG are set to != "no". 2008-08-28 23:32:51 +00:00
mrg
1bae5733ee xorg server is version 1.4.2 2008-08-28 07:18:19 +00:00
mrg
f4766ba44d add X11FLAGS.DIX and X11INCS.DIX for use with Xorg.
fix the version to 1.4.2.
2008-08-02 04:36:12 +00:00
mrg
def7d522c2 begin to add support for cross-built Xorg:
- add MKXORG
- default to DRI-on for Xorg
- add paths for 192 Xorg packages that will exist in
  xsrc/external/mit/<package>/dist
- add some more X11FLAGS.* variables if MKXORG.

this is somewhat based on the xorg work rtr@ did a couple of years ago.

XXX: seriously need to fix the XORG_RELEASE value, it is still set to
XXX: 6.8.1 from when rtr was working on this.
2008-07-29 04:40:14 +00:00
phx
ae0b13c01b Make XFree86 compile for ofppc.
Approved by garbled.
2008-03-08 10:37:48 +00:00