Commit Graph

18 Commits

Author SHA1 Message Date
chs b8035c1db1 add a shared-lib dependency on libfreetype, since this library calls that one. 2005-09-22 15:42:57 +00:00
rtr 8c050b7c06 + cleanup removal of -DUSE_NBSD_THREADLIB usage 2005-01-21 05:15:36 +00:00
lukem b8d2105c21 Need to prefix relative directories with `${.CURDIR}/' so that
objdir builds in the src tree (i.e, without MAKEOBJDIR{,PREFIX}) work.
2004-08-05 01:28:47 +00:00
lukem f4b86cdac7 Convert from DPADD/LDADD to LIBDPLIBS (from bsd.lib.mk), which allows
libraries to be linked at other libraries that have been built but
not yet installed.
2004-08-04 08:37:04 +00:00
lukem 10cfcae8fc Radically overhaul X11 configuration:
*	End user modifiable configuration has moved from
		/usr/X11R6/lib/X11/<someprog>
	to
		/etc/X11/<someprog>
	This is consistent with our own policies as well as other projects.

	The files & directories that were moved have _NOT_ been marked
	`obsolete', as they contain user configuration and therefore we
	don't want the automatic "obsolete file removal" mechanism to
	remove them.

    *	The /etc/font/* and /etc/X11/* configuration files are installed
	with 'configinstall' (not 'install'), using CONFIGFILES and
	CONFIGSYMLINKS.
	This is so that a normal 'make build' in src/x11 will not
	trash your configuration.

    *	A 'distribution' target has been added to src/x11 to perform
	'make configinstall' in the appropriate subdirectories.
	(Should we consider making 'configinstall' a first-class target?)

    * 	The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps
	where the other pixmaps are.
	(I don't consider these pictures end-user configuration).


IMPORTANT NOTE:

    *	These changes require an up to date xsrc, and 'make cleandir' should
	be performed in src/x11 before a build for the changes to fully take
	effect.
2004-05-16 10:25:13 +00:00
lukem d2df9b79b4 Sync to changes made in XFree86 4.4 and add -DXFREE86_FT2 appropriately. 2004-04-29 05:18:25 +00:00
lukem 8a1597d78b Fix up botches in X userland from upgrade from XFree86 4.3.0 -> 4.4.0.
(All paths are relative to usr/X11R6)

* Obsolete:
	bin/fontconfig-config

* Add directories:
	lib/X11/locale/zh_CN.UTF-8
	lib/X11/xkb/geometry/ibm

* Rename include/freetype2/ft2build.h to include/ft2build.h and obsolete former

* Add files:
	fonttosfnt(1) program & man page
	include/expat.h
	lib/X11/app-defaults/XClock-color
	lib/X11/fonts/TTF/Vera*.ttf
	some font encodings
	zn_CN.UTF-8 locale
	some font encodings
	various xkb config files
	lib/X11/xedit/lisp/progmodes/patch.lsp
	Xfontcache(3) and various links
	XDGA(3) and various links
	XRes(3) and various links
	Xss(3) and various XScreenSaver*(3) links

* Add some more TODO items

* Clean up lib/expat build now that the version is hard coded.
2004-04-28 14:17:55 +00:00
rtr 020fb098d7 freetype/Makefile
+ substitute @hardcode_libdir_flag_spec@ with -Wl,-rpath,/usr/X11R6/lib
  + substitute @LIBZ@ with -lz
fontconfig/Makefile
  + substitute @hardcode_libdir_flag_spec@ with -Wl,-rpath,/usr/X11R6/lib

should resolve pr#24747

XXX native built xf 4.4 may suffer from the same problem
2004-03-11 16:13:30 +00:00
rtr 9db533ef43 + update reachover lib/* for xf4.4
XXX font/Makefile needs to be re-examined, but builds for now.
2004-03-06 03:05:39 +00:00
rtr e1bbf3c9e0 + pre-build and install libexpat before lib/*
+ link libfontconfig w/ libexpat.

Should resolve pr#24527.
2004-02-23 05:47:47 +00:00
lukem d51a64d931 clean up temporary files 2004-02-09 05:58:24 +00:00
rtr c5a3389d51 use ${HOST_SH} instead of sh 2004-01-08 04:45:12 +00:00
rtr f2914ee88d pkg-config (pc) and -config scripts 2004-01-06 06:15:45 +00:00
lukem 06b22cf0b9 Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${somepathvar}'.
Suggested by Matt Thomas.
2003-09-30 06:41:29 +00:00
lukem e214d537fb Rework to include <bsd.x11.mk> before all other <bsd.*.mk> _except_
<bsd.own.mk>, as we now set BINDIR,LIBDIR,MANDIR in <bsd.x11.mk>
rather than using a hierarchy of Makefile.inc files just to include
x11/Makefile.inc to get those variables.
2003-09-13 20:17:57 +00:00
lukem 2854e6f642 Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x
(from /usr/xsrc) using bsd-style Makefiles.
Why?
    -	sane cross building
    -	easy builds from read only source
    -	non-root building
    -	imake is evil
nuff said.
2003-09-12 04:43:18 +00:00
lukem fd2c85e985 Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x
(from /usr/xsrc) using bsd-style Makefiles.
Why?
    -	sane cross building
    -	easy builds from read only source
    -	non-root building
    -	imake is evil
nuff said.
2003-09-12 02:49:56 +00:00
lukem 98ad6e84d6 Imakeicide-II: reach-over makefile infrastructure to build XFree86 4.x
(from /usr/xsrc) using bsd-style Makefiles.
Why?
    -	sane cross building
    -	easy builds from read only source
    -	non-root building
    -	imake is evil
nuff said.
2003-09-11 18:37:05 +00:00