Package: kdrill Version: 6.4-2.1 Severity: grave Tags: patch Hi Philip,
The kdrill package is currently uninstallable in unstable, because it still installs to /usr/X11R6/bin which is being turned into a compatibility symlink for the X11R7 transition. Fortunately, since ctwm is using imake the transition is fairly easy, but it does require a patch when rebuilding with the new imake due to some hard-coded references to /usr/X11R6/bin. Please find the short patch for this attached. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u kdrill-6.4/Makefile kdrill-6.4/Makefile
--- kdrill-6.4/Makefile
+++ kdrill-6.4/Makefile
@@ -1,314 +1,528 @@
# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.89 94/08/12 00:45:51 gildea Exp $
+# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
-# -----------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.j9aizV>
-# $XConsortium: Imake.tmpl,v 1.219 94/05/13 15:58:31 matt Exp $
-# $SunSoft: @(#)Imake.tmpl 1.1 01/13/97 16:16:22 $
-#
-
-# **************************************************************************
-# NOTE:
-#
-# If the user does not define DESTDIR and/or BINDIR in the local Imakefile,
-# 'make install' will install the resultant binaries in /usr/openwin/bin.
-# This usually fails because of lack of write permission in that directory
-# for non-root users.
-#
-# The reason is that the default definition of ProjectRoot is /usr/openwin.
-# This value determines all other definitions, e.g. the binary, library and
-# manual page directories, etc. The destination directory, DESTDIR, is not
-# defined and BINDIR is defined as $(ProjectRoot)/bin in Project.tmpl.
-#
-# Care must be taken when changing ProjectRoot. It affects the inclusion
-# path of 'imake' in finding the *.cf, *.def, *.tmpl and *.rules files,
-# which are in /usr/openwin/lib/X11/config/, and the default inclusion path
-# of X11 header files and libraries. Therefore, if ProjectRoot is changed
-# not only these configuration files need to be copied to a proper location,
-# defined by IRULESRC, so 'make Makefile' can work properly, the header file
-# inclusion path, /usr/openwin/include, and the library search path,
-# /usr/openwin/lib, also need to be defined properly either in the local
-# Imakefile or one of the configuration files to avoid compilation errors
-# for programs that use X11 header files or libraries.
-#
-# Please refer to Project.tmpl, Imake.tmpl, site.def, etc. in
-# /usr/openwin/lib/X11/config/ for details.
-# **************************************************************************
+# ----------------------------------------------------------------------
+# Makefile generated from "Imake.tmpl" and </tmp/IIf.WZHca6>
+# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
+# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $
+#
+#
+#
+#
+# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $
+# ----------------------------------------------------------------------
+
+all::
.SUFFIXES: .i
-# $XConsortium: Imake.cf,v 1.12 94/03/29 15:42:08 gildea Exp $
-# $SunSoft: @(#)Imake.cf 1.1 01/13/97 16:16:21 $
+# $XdotOrg: xc/config/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
+# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
+
+# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+
+# Keep cpp from replacing path elements containing i486/i586/i686
# -----------------------------------------------------------------------
# site-specific configuration parameters that need to come before
# the platform-specific parameters - edit site.def to change
-# site: $XConsortium: site.sample,v 1.11 94/06/03 19:50:12 matt Exp $
-# site: $SunSoft: @(#)site.def 1.1 01/13/97 16:16:27$
+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-# -----------------------------------------------------------------------
-# platform-specific configuration parameters - edit sun.cf to change
+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
-# platform: $XConsortium: sun.cf,v 1.133 94/07/08 12:23:12 gildea Exp $
-# platform: $SunSoft: @(#)sun.cf 1.11 05/04/01 13:49:33 $
+# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
-# operating system: SunOS 5.9 x86
+# ----------------------------------------------------------------------
+# platform-specific configuration parameters - edit linux.cf to change
-# SUNSOFT SUNSOFT_LOADABLE
+# $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $
+# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-# $XConsortium: svr4.cf,v 1.6 94/04/08 18:56:33 rws Exp $
-# $SunSoft: @(#)svr4.cf 1.1 01/13/97 16:16:29 $
+# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
Exp $
-# $XConsortium: sv4Lib.rules,v 1.14 94/04/09 12:00:10 rws Exp $
-# $SunSoft: @(#)sv4Lib.rules 1.1 01/13/97 16:16:28 $
+# operating system: Linux 2.6.16-1-amd64-k8 i686 [ELF] (2.6.16)
+# libc: (6.3.6)
+# binutils: (216)
-# SUNSOFT SUNSOFT_LOADABLE
+# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
+# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
- TROFFTOPS = /usr/lib/lp/postscript/dpost |
/usr/lib/lp/postscript/postreverse -r
+# $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
-# -----------------------------------------------------------------------
+# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
+
+XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0)
+RELEASE_VERSION = RELEASE-1
+
+AFB_DEFS = -DUSE_AFB
+
+DRIVERSDKDIR = $(USRLIBDIR)/Server
+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
+
+ XF86SRC = $(SERVERSRC)/hw/xfree86
+ XF86COMSRC = $(XF86SRC)/common
+ XF86PARSERSRC = $(XF86SRC)/parser
+ XF86OSSRC = $(XF86SRC)/os-support
+ XF86DRIVERSRC = $(XF86SRC)/drivers
+ DRIVERSRC = $(XF86DRIVERSRC)
+
+ XFREE86DOCDIR = $(DOCDIR)
+ XFREE86PSDOCDIR = $(DOCPSDIR)
+ XFREE86PDFDOCDIR = $(DOCPDFDIR)
+ XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
+
+# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
+
+# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $
+
+ SELINUX_LDFLAGS =
+
+ SELINUX_INCLUDES = -I/usr/include/selinux
+
+ SELINUX_CFLAGS = -DHAVE_SELINUX
+
+ SELINUX_LIBS = -lselinux
+
+# ----------------------------------------------------------------------
# site-specific configuration parameters that go after
# the platform-specific parameters - edit site.def to change
-# site: $XConsortium: site.sample,v 1.11 94/06/03 19:50:12 matt Exp $
-# site: $SunSoft: @(#)site.def 1.1 01/13/97 16:16:27$
+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
-# -----------------------------------------------------------------------
+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $
+
+# ---------------------------------------------------------------------
# Imake rules for building libraries, programs, scripts, and data files
-# rules: $XConsortium: Imake.rules,v 1.193 94/04/10 17:39:55 rws Exp $
-# rules: $SunSoft: @(#)Imake.rules 1.1 01/13/97 16:16:21 $
+# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
+# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj
Exp $
+#
+#
+#
+#
+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes
Exp $
+
+.PHONY: all interfaces install install.man install.lib install.sdk depend
includes cleandir
+
+ _NULLCMD_ = @ echo -n
+
+X_BYTE_ORDER = X_LITTLE_ENDIAN
+
+GLIDE2INCDIR = /usr/include/glide
+
+GLIDE3INCDIR = /usr/include/glide3
+
+GLIDE3LIBNAME = glide3
+
+TKLIBNAME = tk8.4
-# SUNSOFT SUNSOFT_LOADABLE
+TKLIBDIR = /usr/lib
+
+TCLLIBNAME = tcl8.4
+
+TCLIBDIR = /usr/lib
PATHSEP = /
- SHELL = /bin/sh
+ SHELL = /bin/sh -e
TOP = .
CURRENT_DIR = .
IMAKE = imake
- DEPEND = makedepend
- MKDIRHIER = mkdirhier
+ DEPEND = gccmakedep
+ MKDIRHIER = mkdir -p
+ REVPATH = revpath
+ EXPORTLISTGEN =
+ RMAN = /usr/bin/rman
+ RMANBASENAME = rman
+ RMANOPTIONS =
CONFIGSRC = $(TOP)/config
IMAKESRC = $(CONFIGSRC)/imake
- DEPENDSRC = $(CONFIGSRC)/makedepend
- IXXSRC = $(UNSUPPORTEDSRC)/programs/ixx
- IXX = ixx
- IXXFLAGS = -s BaseObject -m TypeObj -r RequestObj -p Xf
- IXXINCLUDES = -i '<X11/Fresco/enter-scope.h>'
-
- INCROOT = /usr/openwin/include
- USRLIBDIR = /usr/openwin/lib
- SHLIBDIR = /usr/openwin/lib
- LINTLIBDIR = $(USRLIBDIR)
- MANPATH = /usr/openwin/share/man
+ DEPENDSRC = $(CONFIGSRC)/util
+
+ INCROOT = /usr/X11R6/include
+ USRLIBDIR = /usr/X11R6/lib
+ VARDIR = /var
+ VARLIBDIR = $(VARDIR)/lib
+ SYSTEMUSRLIBDIR = /usr/lib
+ SYSTEMUSRINCDIR = /usr/include
+ SHLIBDIR = /usr/X11R6/lib
+ LINTLIBDIR = $(USRLIBDIR)/lint
+ MANPATH = /usr/X11R6/man
MANSOURCEPATH = $(MANPATH)/man
- MANDIR = $(MANSOURCEPATH)1
- LIBMANDIR = $(MANSOURCEPATH)3
- FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSUFFIX)
-
- AR = /usr/ccs/bin/ar cq
- BOOTSTRAPCFLAGS = -DSVR4
- CC = gcc -fpcc-struct-return
- AS = /usr/ccs/bin/as
+ MANDIR = $(MANSOURCEPATH)$(MANSECT)
+ SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT)
+ LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT)
+ DRIVERMANDIR = $(MANSOURCEPATH)4
+ FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT)
+ GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT)
+ MISCMANDIR = $(MANSOURCEPATH)7
+ ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT)
+ ICONDIR = /usr/X11R6/lib/X11/icons
+ XCURSORPATH =
~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons
+ DRIVERMANDIR = $(MANSOURCEPATH)4
+ LOGDIRECTORY = $(VARDIR)/log
+
+ VARRUNDIR = $(VARDIR)/run
+
+ VARDBDIR = $(VARDIR)/lib
+
+ AR = ar clq
+
+# Nice try but useless: make will inherit BOOTSTRAPCFLAGS
+# from top Makefile
+ BOOTSTRAPCFLAGS =
+
+ CC = gcc -m32
+ AS = gcc -m32 -c -x assembler
+
+.SUFFIXES: .cc
+
+ CXX = c++ -m32
-.SUFFIXES: .cxx
+ CXXFILT = c++filt
- CXX = g++
- CXXDEBUGFLAGS = -O2
+ CXXLIB = -lstdc++
+
+ CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing
+CXXDEPENDINCLUDES =
CXXEXTRA_DEFINES =
CXXEXTRA_INCLUDES =
- CXXIDL_INCLUDES = -I$(TOP)/include
- CXXSTD_DEFINES = -Dsun -Di386 -DSVR4 -DSYSV
+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(CXXPROJECT_DEFINES)
CXXOPTIONS =
- CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
$(CXXIDL_INCLUDES)
- CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES)
$(CXXEXTRA_DEFINES)
+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES)
$(DEFINES) $(CXXEXTRA_DEFINES)
CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS)
$(CXXDEFINES)
COMPRESS = compress
- CPP = /usr/ccs/lib/cpp $(STD_CPP_DEFINES)
- PREPROCESSCMD = gcc -fpcc-struct-return -E $(STD_CPP_DEFINES)
- INSTALL = /usr/ucb/install
+ GZIPCMD = gzip
+
+ CPP = cpp $(STD_CPP_DEFINES)
+ RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
+ PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
+
+ INSTALL = install
INSTALLFLAGS = -c
- LD = /usr/ccs/bin/ld
- LEX = /usr/ccs/bin/lex
- LEXLIB = -ll
- YACC = /usr/ccs/bin/yacc
- CCYACC = /usr/ccs/bin/yacc
+
+ LD = gcc -m32 -nostdlib
+
+ LEX = flex -l
+ M4 = m4
+ M4FLAGS =
+ LEXLIB = -lfl
+ YACC = bison -y
+ CCYACC = bison -y
+
LINT = lint
- LINTLIBFLAG = -o
- LINTOPTS = -b -h -Xc
+
+ LINTLIBFLAG = -C
+ LINTOPTS = -axz
LN = ln -s
- MAKE = /usr/ccs/bin/make
- MV = mv
+ MAKE = make
+ MV = mv -f
CP = cp
+ RANLIB = ranlib
+
+ RANLIBINSTFLAGS =
+
RM = rm -f
- MANSUFFIX = 1
- LIBMANSUFFIX = 3
- FILEMANSUFFIX = 4
- TROFF = troff -t -Tpost
+ PERL = perl
+ PERLOPTS =
+ PERLENVSETUP = env LC_ALL=C
+
+ MANSECT = 1
+ SYSCALLMANSECT = 2
+ LIBMANSECT = 3
+ DRIVERMANSECT = 4
+ FILEMANSECT = 5
+ GAMEMANSECT = 6
+ MISCMANSECT = 7
+ ADMMANSECT = 8
+ MANSRCSECT = s
+ MANNEWSECT = n
+ PROJECTMANSUFFIX = x
+ MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX)
+ SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
+ LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX)
+ DRIVERMANSUFFIX = 4x
+ FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX)
+ GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX)
+ MISCMANSUFFIX = 7x
+ ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX)
+ ADMINMANSUFFIX = 8
+ MANSRCSUFFIX = man
+ MANNEWSUFFIX = _man
+ MANDEFS = -D__apploaddir__=$(XAPPLOADDIR)
-D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX)
-D__osfilemansuffix__=$(FILEMANSECT)
-D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX)
-D__oslibmansuffix__=$(LIBMANSECT)
-D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT)
-D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
-D__ossysmansuffix__=$(SYSCALLMANSECT)
-D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX)
-D__osgamemansuffix__=$(GAMEMANSECT)
-D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX)
-D__osmiscmansuffix__=$(MISCMANSECT)
-D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX)
-D__osadmmansuffix__=$(ADMMANSECT)
-D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX)
-D__osmiscmansuffix__=$(MISCMANSECT)
-D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX)
-D__osdrivermansuffix__=$(DRIVERMANSECT) -D__adminmansuffix__=$(ADMINMANSUFFIX)
-D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE)
-D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE)
-D__xservername__=$(XSERVERNAME)
-D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) $(XORGMANDEFS) $(VENDORMANDEFS)
+
+ COMPRESSMANCMD = gzip -n
+
+ TROFF = groff -Tps
+ NROFF = nroff
+
MSMACROS = -ms
+ MANMACROS = -man
TBL = tbl
EQN = eqn
+ NEQN = neqn
+ COL = col
+ COLFLAGS = -b
+
+ MODCC = gcc -m32
+
+ MODCPP = cpp
+ MODCFLAGS = $(CFLAGS)
+ MODAS = gcc -m32 -c -x assembler
+ MODASFLAGS =
+
+ MODLD = gcc -m32 -nostdlib
+
+ MODLDFLAGS =
+MODLDCOMBINEFLAGS = -r
+ MODAR = ar clq
+
+ MODRANLIB = ranlib
DVIPS = dvips
LATEX = latex
STD_INCLUDES =
- STD_CPP_DEFINES = -Dsun -Di386 -DSVR4 -DSYSV
- STD_DEFINES = -Dsun -Di386 -DSVR4 -DSYSV
+ STD_CPP_OPTIONS = -traditional
+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(PROJECT_DEFINES)
+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(PROJECT_DEFINES)
EXTRA_LOAD_FLAGS =
EXTRA_LDOPTIONS =
- EXTRA_LIBRARIES = -lsocket -lnsl
+ EXTRA_LIBRARIES =
TAGS = ctags
+ PARALLELMFLAGS =
+
SHAREDCODEDEF =
SHLIBDEF =
- SHLIBLDFLAGS = -G -z text -M mapfile
+ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS)
+
+ NOSTDLIB = -nostdlib
+ POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic
- PICFLAGS = -fpic
+ PICFLAGS = -fPIC
- CXXPICFLAGS = -fpic
+ CXXPICFLAGS = -fPIC
- PROTO_DEFINES =
+ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
INSTPGMFLAGS =
INSTBINFLAGS = -m 0755
- INSTUIDFLAGS = -m 4755
+ INSTUIDFLAGS = -m 4711
INSTLIBFLAGS = -m 0644
- INSTINCFLAGS = -m 0644
+ INSTINCFLAGS = -m 0444
INSTMANFLAGS = -m 0444
INSTDATFLAGS = -m 0444
- INSTKMEMFLAGS = -g sys -m 2755
+ INSTKMEMFLAGS = -m 4711
- PROJECTROOT = /usr/openwin
+ PROJECTROOT = /usr/X11R6
- TOP_INCLUDES = -I$(INCROOT)
-
- CDEBUGFLAGS = -O2
+ CDEBUGFLAGS = -g -O2 -fno-strict-aliasing
CCOPTIONS =
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES)
$(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES)
$(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES)
$(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES)
$(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS)
$(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = -L$(USRLIBDIR)
+ LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS)
LDPOSTLIB =
- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS)
$(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS)
$(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS)
$(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS)
$(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
- LDLIBS = $(LDPOSTLIB) $(THREADS_LIBS) $(SYS_LIBRARIES)
$(EXTRA_LIBRARIES)
+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES)
$(EXTRA_LIBRARIES)
- CCENVSETUP = LD_RUN_PATH=$(USRLIBDIR)
- CCLINK = $(CCENVSETUP) $(CC)
+ CCLINK = $(CC)
- CXXENVSETUP = LD_RUN_PATH=$(USRLIBDIR)
- CXXLINK = $(CXXENVSETUP) $(CXX)
+ CXXLINK = $(CXX)
LDSTRIPFLAGS = -x
LDCOMBINEFLAGS = -r
DEPENDFLAGS =
+ DEPEND_DEFINES =
+
+# Not sure this belongs here
+ TKLIBDIR = /usr/lib
+ TKINCDIR = /usr/include
+ TKLIBNAME = tk8.4
+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
+ TCLLIBDIR = /usr/lib
+ TCLINCDIR = /usr/include
+ TCLLIBNAME = tcl8.4
+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
- MACROFILE = sun.cf
+ MACROFILE = linux.cf
RM_CMD = $(RM)
IMAKE_DEFINES =
+ IMAKE_WARNINGS = -Wundef
IRULESRC = $(CONFIGDIR)
- IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
+ IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
$(IMAKE_WARNINGS)
- ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl \
- $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \
- $(EXTRA_ICONFIGFILES)
+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl
$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE)
$(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def
$(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
-# -----------------------------------------------------------------------
+# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
+
+# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
+
+# ----------------------------------------------------------------------
# X Window System Build Parameters and Rules
-# $XConsortium: Project.tmpl,v 1.242 94/04/13 14:58:40 rws Exp $
-# $SunSoft: @(#)Project.tmpl 1.6 05/30/02 19:12:02 $
+# $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $
+# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
+
+XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+ XORGMANNAME = X Version 11
+
+STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
-# SUNSOFT SUNSOFT_LOADABLE
+FCHOWN_DEFINES = -DHAS_FCHOWN
# -----------------------------------------------------------------------
# X Window System make variables; these need to be coordinated with rules
- BINDIR = /usr/openwin/bin
- BUILDINCROOT = $(TOP)
- BUILDINCDIR = $(BUILDINCROOT)/X11
- BUILDINCTOP = ..
- BUILDLIBDIR = $(TOP)/usrlib
- BUILDLIBTOP = ..
- INCDIR = $(INCROOT)/X11
+ XTOP = $(TOP)
+ BINDIR = /usr/X11R6/bin
+ BUILDINCROOT = $(TOP)/exports
+ BUILDINCDIR = $(BUILDINCROOT)/include
+ BUILDINCTOP = ../..
+ BUILDLIBDIR = $(TOP)/exports/lib
+ BUILDLIBTOP = ../..
+ BUILDBINDIR = $(TOP)/exports/bin
+ BUILDBINTOP = ../..
+ BUILDMODULEDIR = $(BUILDLIBDIR)/modules
+ BUILDI18NDIR = $(BUILDLIBDIR)/locale
+ BUILDMODULETOP = $(BUILDLIBTOP)/..
+ XBUILDINCROOT = $(XTOP)/exports
+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
+ XBUILDINCTOP = ../../..
+ XBUILDBINDIR = $(XBUILDINCROOT)/bin
+ INCDIR = $(INCROOT)
ADMDIR = /usr/adm
- LIBDIR = $(USRLIBDIR)/X11
-
+ LIBDIR = /usr/X11R6/lib/X11
+ LIBEXECDIR = /usr/X11R6/libexec
+ MODULEDIR = $(USRLIBDIR)/modules
+ TOP_X_INCLUDES =
+ XBINDIR = $(PROJECTROOT)/bin
+
+ INSTSRCDIR = /usr/X11R6/src
+
+ ETCX11DIR = /etc/X11
+
+ CONFDIR = $(ETCX11DIR)
+
+ DOCDIR = $(LIBDIR)/doc
+ DOCHTMLDIR = $(DOCDIR)/html
+ DOCPSDIR = $(DOCDIR)/PostScript
+ DOCPDFDIR = $(DOCDIR)/PDF
FONTDIR = $(LIBDIR)/fonts
+ ENCODINGSDIR = $(LIBDIR)/fonts/encodings
XINITDIR = $(LIBDIR)/xinit
XDMDIR = $(LIBDIR)/xdm
+ XDMVARDIR = $(VARLIBDIR)/xdm
TWMDIR = $(LIBDIR)/twm
+ XSMDIR = $(LIBDIR)/xsm
NLSDIR = $(LIBDIR)/nls
- XLOCALEDIR = $(PROJECTROOT)/lib/locale
- PEXAPIDIR = $(LIBDIR)/PEX
- XAPPLOADDIR = $(LIBDIR)/app-defaults
+ XLOCALEDIR = $(LIBDIR)/locale
+ LBXPROXYDIR = $(LIBDIR)/lbxproxy
+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr
+ XPRINTDIR = $(LIBDIR)/xserver
+ XAPPLOADDIR = /etc/X11/app-defaults
FONTCFLAGS = -t
INSTAPPFLAGS = $(INSTDATFLAGS)
- RGB = rgb
- FONTC = bdftopcf
- MKFONTDIR = mkfontdir
-
- DOCUTILSRC = $(TOP)/doc/util
+ RGB = $(XBINDIR)/rgb
+ FONTC = $(XBINDIR)/bdftopcf
+ MKFONTSCALE = $(XBINDIR)/mkfontscale
+ MKFONTDIR = $(XBINDIR)/mkfontdir
+ MKHTMLINDEX = $(XBINDIR)/mkhtmlindex
+ UCS2ANY = $(XBINDIR)/ucs2any
+ BDFTRUNCATE = $(XBINDIR)/bdftruncate
+ UCSMAPPREFIX = $(FONTDIR)/util/map-
+ XCURSORGEN = $(XBINDIR)/xcursorgen
+
+ HTMLINDEXCMD = HtmlIndexCmd
+
+ DOCUTILSRC = $(XTOP)/doc/util
+ CLIENTSRC = $(TOP)/clients
+ DEMOSRC = $(TOP)/demos
XDOCMACROS = $(DOCUTILSRC)/macros.t
XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
PROGRAMSRC = $(TOP)/programs
- LIBSRC = $(TOP)/lib
- FONTSRC = $(TOP)/fonts
- INCLUDESRC = $(TOP)/X11
- SERVERSRC = $(TOP)/programs/Xserver
- CONTRIBSRC = $(TOP)/../contrib
- UNSUPPORTEDSRC = $(TOP)/unsupported
- DOCSRC = $(TOP)/doc
- RGBSRC = $(TOP)/programs/rgb
+ LIBSRC = $(XTOP)/lib
+ FONTSRC = $(XTOP)/fonts
+ ENCODINGSSRC = $(FONTSRC)/encodings
+ INCLUDESRC = $(BUILDINCROOT)/include
+ XINCLUDESRC = $(INCLUDESRC)/X11
+ SERVERSRC = $(XTOP)/programs/Xserver
+ CONTRIBSRC = $(XTOP)/../contrib
+ UNSUPPORTEDSRC = $(XTOP)/unsupported
+ DOCSRC = $(XTOP)/doc
+ RGBSRC = $(XTOP)/programs/rgb
BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
FONTSERVERSRC = $(PROGRAMSRC)/xfs
- FONTINCSRC = $(TOP)/include/fonts
- EXTINCSRC = $(TOP)/include/extensions
+ FONTINCSRC = $(XTOP)/include/fonts
+ EXTINCSRC = $(XTOP)/include/extensions
+ FTSOURCEDIR = FreeTypeSrcDir
+ DRMSRCDIR = $(TOP)/extras/drm
+ MESASRCDIR = $(TOP)/extras/Mesa
+ OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample
+ PSWRAPSRC = $(XTOP)/config/pswrap
TRANSCOMMSRC = $(LIBSRC)/xtrans
TRANS_INCLUDES = -I$(TRANSCOMMSRC)
+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
-DIPv6
+XTRANS_FAILDEFINES = -DFAIL_HARD
-# $XConsortium: sunLib.tmpl,v 1.37 95/05/23 14:31:40 matt Exp $
-# SunSoft: @(#)sunLib.tmpl 1.4 05/30/02 17:00:20
+ VENDORMANNAME = X.Org
+ VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+ XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
+ VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)"
+ VENDORNAME = The X.Org Foundation
+ VENDORNAMESHORT = X.Org
-# $XConsortium: sv4Lib.tmpl,v 1.19 93/12/03 10:48:36 kaleb Exp $
-# $SunSoft: @(#)sv4Lib.tmpl 1.1 01/13/97 16:16:29 $
+ VENDORWEBSUPPORT = http://wiki.X.Org
-XMULIBONLY = -lXmu -lm
-XMULIB = -lXmu -lm
+VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"'
- SERVERLIB = /usr/openwin/server/lib
+ XKBDEFRULES = xorg
+ XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"'
- SERVERMODULES = /usr/openwin/server/modules
+ XCONFIGFILE = xorg.conf
+ XCONFIGDIR = $(LIBDIR)
+ XLOGFILE = Xorg
+ XSERVERNAME = Xorg
- SERVERETC = /usr/openwin/server/etc
+ XENVLIBDIR = $(USRLIBDIR)
+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
XLOCALEDIR=$(BUILDLIBDIR)/locale
-SHLIBLDFLAGS = -G -z text -M mapfile
-PICFLAGS = -fpic
-MAPFILE = mapfile
+# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
XLIBSRC = $(LIBSRC)/X11
-SOXLIBREV = 4
+SOXLIBREV = 6.2
DEPXONLYLIB =
XONLYLIB = -lX11
LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
+ DEPXLIBONLY = $(DEPXONLYLIB)
XLIBONLY = $(XONLYLIB)
+ LINTXONLYLIB = $(LINTXONLY)
XEXTLIBSRC = $(LIBSRC)/Xext
@@ -325,80 +539,101 @@
XSSLIBSRC = $(LIBSRC)/Xss
-DEPXSSLIB = $(USRLIBDIR)/libXss.a
+SOXSSREV = 1.0
+DEPXSSLIB =
XSSLIB = -lXss
LINTXSS = $(LINTLIBDIR)/llib-lXss.ln
XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
-DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a
+SOXXF86MISCREV = 1.1
+DEPXXF86MISCLIB =
XXF86MISCLIB = -lXxf86misc
LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln
XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
-DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a
+SOXXF86VMREV = 1.0
+DEPXXF86VMLIB =
XXF86VMLIB = -lXxf86vm
LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln
XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
-DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a
+SOXXF86DGAREV = 1.0
+DEPXXF86DGALIB =
XXF86DGALIB = -lXxf86dga
LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
-DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a
+SOXXF86RUSHREV = 1.0
+DEPXXF86RUSHLIB =
XXF86RUSHLIB = -lXxf86rush
LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln
XVLIBSRC = $(LIBSRC)/Xv
-DEPXVLIB = $(USRLIBDIR)/libXv.a
+SOXVREV = 1.0
+DEPXVLIB =
XVLIB = -lXv
LINTXV = $(LINTLIBDIR)/llib-lXv.ln
XVMCLIBSRC = $(LIBSRC)/XvMC
-DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a
+SOXVMCREV = 1.0
+DEPXVMCLIB =
XVMCLIB = -lXvMC
LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln
XINERAMALIBSRC = $(LIBSRC)/Xinerama
-DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a
+SOXINERAMAREV = 1.0
+DEPXINERAMALIB =
XINERAMALIB = -lXinerama
LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
+ XRESLIBSRC = $(LIBSRC)/XRes
+
+SOXRESREV = 1.0
+DEPXRESLIB =
+XRESLIB = -lXRes
+
+LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln
+
+ DMXLIBSRC = $(LIBSRC)/dmx
+
+SODMXREV = 1.0
+DEPDMXLIB =
+DMXLIB = -ldmx
+
+LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln
+
DPSLIBSRC = $(LIBSRC)/dps
-SODPSREV = 1.0
-DEPDPSLIB =
+DEPDPSLIB = $(USRLIBDIR)/libdps.a
DPSLIB = -ldps
LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
DPSTKLIBSRC = $(LIBSRC)/dpstk
-SODPSTKREV = 1.0
-DEPDPSTKLIB =
+DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a
DPSTKLIB = -ldpstk
LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
PSRESLIBSRC = $(LIBSRC)/psres
-SOPSRESREV = 1.0
-DEPPSRESLIB =
+DEPPSRESLIB = $(USRLIBDIR)/libpsres.a
PSRESLIB = -lpsres
LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
@@ -426,22 +661,75 @@
LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln
- XRENDERLIBSRC = $(LIBSRC)/Xrender
-
-SOXRENDERREV = 1.1
+XRENDERDIR = /usr
+XRENDERLIBDIR = /usr/lib
+XRENDERINCDIR = /usr/include
+XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
DEPXRENDERLIB =
-XRENDERLIB = -lXrender
-LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln
+XRENDERINCLUDES = -I$(XRENDERINCDIR)
- XRANDRRLIBSRC = $(LIBSRC)/Xrandr
+ XRANDRLIBSRC = $(LIBSRC)/Xrandr
-SOXRANDRREV = 1.0
+SOXRANDRREV = 2.0
DEPXRANDRLIB =
XRANDRLIB = -lXrandr
LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln
+ XFIXESLIBSRC = $(LIBSRC)/Xfixes
+
+SOXFIXESREV = 3.0
+DEPXFIXESLIB =
+XFIXESLIB = -lXfixes
+
+LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln
+
+ XDAMAGELIBSRC = $(LIBSRC)/Xdamage
+
+SOXDAMAGEREV = 1.0
+DEPXDAMAGELIB =
+XDAMAGELIB = -lXdamage
+
+LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln
+
+XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
+
+SOXCOMPOSITEREV = 1.0
+DEPXCOMPOSITELIB =
+XCOMPOSITELIB = -lXcomposite
+
+LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln
+
+XEVIELIBSRC = $(LIBSRC)/Xevie
+
+SOXEVIEREV = 1.0
+DEPXEVIELIB =
+XEVIELIB = -lXevie
+
+LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln
+
+XCURSORDIR = /usr
+XCURSORLIBDIR = /usr/lib
+XCURSORINCDIR = /usr/include
+XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
+
+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
+
+ APPLEWMLIBSRC = $(LIBSRC)/apple
+
+DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a
+APPLEWMLIB = -lAppleWM
+
+LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln
+
+ WINDOWSWMLIBSRC = $(LIBSRC)/windows
+
+DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a
+WINDOWSWMLIB = -lWindowsWM
+
+LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln
+
XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a
@@ -451,14 +739,16 @@
XAUTHSRC = $(LIBSRC)/Xau
-DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
+SOXAUTHREV = 6.0
+DEPXAUTHLIB =
XAUTHLIB = -lXau
LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
+SOXDMCPREV = 6.0
+DEPXDMCPLIB =
XDMCPLIB = -lXdmcp
LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
@@ -516,12 +806,20 @@
AWIDGETSRC = $(LIBSRC)/Xaw
-SOXAWREV = 7.0
+SOXAWREV = 8.0
DEPXAWLIB =
XAWLIB = -lXaw
LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
+ AWIDGET7SRC = $(LIBSRC)/Xaw7
+
+SOXAW7REV = 7.0
+DEPXAW7LIB =
+XAW7LIB = -lXaw
+
+LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln
+
AWIDGET6SRC = $(LIBSRC)/Xaw6
SOXAW6REV = 6.1
@@ -546,29 +844,6 @@
LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
- PEXLIBSRC = $(LIBSRC)/PEX5
-
-SOPEXREV = 6.0
-DEPPEXLIB =
-PEXLIB = -lPEX5
-
-LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
-
- XIELIBSRC = $(LIBSRC)/XIE
-
-SOXIEREV = 6.0
-DEPXIELIB =
-XIELIB = -lXIE
-
-LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln
-
- PHIGSLIBSRC = $(LIBSRC)/PHIGS
-
-DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
-PHIGSLIB = -lphigs
-
-LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
-
DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
XBSDLIB = -lXbsd
@@ -576,7 +851,7 @@
ICESRC = $(LIBSRC)/ICE
-SOICEREV = 6.3
+SOICEREV = 6.4
DEPICELIB =
ICELIB = -lICE
@@ -600,7 +875,8 @@
FSLIBSRC = $(LIBSRC)/FS
-DEPFSLIB = $(USRLIBDIR)/libFS.a
+SOFSREV = 6.0
+DEPFSLIB =
FSLIB = -lFS
LINTFS = $(LINTLIBDIR)/llib-lFS.ln
@@ -624,7 +900,7 @@
LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln
DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
- FONTLIB = $(XFONTLIB) $(FONTSTUBLIB)
+ FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB)
FONTENCLIBSRC = $(LIBSRC)/fontenc
@@ -641,45 +917,88 @@
LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
- FREETYPE2LIBSRC = $(LIBSRC)/freetype2
+FREETYPE2DIR = /usr
+FREETYPE2LIBDIR = /usr/lib
+FREETYPE2INCDIR = /usr/include
-SOFREETYPE2REV = 6.2
-DEPFREETYPE2LIB =
-FREETYPE2LIB = -lfreetype
+FREETYPE2LIB = -lfreetype
-LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2
-I$(FREETYPE2INCDIR)/freetype2/config
-FREETYPE2DIR = /usr
-FREETYPE2LIBDIR = /usr/lib
-FREETYPE2INCDIR = /usr/include/freetype2
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
-FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
FREETYPE2DEFINES = -DFREETYPE2
- XFTLIBSRC = $(LIBSRC)/Xft
+ EXPATLIBSRC = $(LIBSRC)/expat
+
+SOEXPATREV = 0.4
+DEPEXPATLIB =
+EXPATLIB = -lexpat
+
+LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln
+
+EXPATDIR = /usr
+EXPATLIBDIR = /usr/lib
+EXPATINCDIR = /usr/include
+
+EXPATINCLUDES =
+
+EXPATLIB = -lexpat
+
+EXPATDEFINES = -DEXPAT
+
+XFTDIR = /usr
+XFTLIBDIR = /usr/lib
+XFTINCDIR = /usr/include
+XFTLIB = -L$(XFTLIBDIR) -lXft
+
+XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
$(XRENDERINCLUDES)
+
+FONTCONFIGDIR = /usr
+FONTCONFIGLIBDIR = /usr/lib
+FONTCONFIGINCDIR = /usr/include
+FONTCONFIGBINDIR = /usr/bin
-SOXFTREV = 1.1
-DEPXFTLIB =
-XFTLIB = -lXft
+FONTCONFIGLIB = -lfontconfig
-LINTXFT = $(LINTLIBDIR)/llib-lXft.ln
+FONTCONFIGINCLUDES =
+
+FCCACHE = $(FONTCONFIGBINDIR)/fc-cache
+
+FONTCONFIGDEFINES = -DFONTCONFIG
+
+LIBPNGINCDIR = /usr/include
+
+LIBPNGINC=
+
+LIBPNGDIR = /usr
+LIBPNGLIBDIR = /usr/lib
+LIBPNGINCDIR = /usr/include
+
+LIBPNGLIB = -lpng
XKBFILELIBSRC = $(LIBSRC)/xkbfile
-DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a
+SOXKBFILEREV = 1.0
+DEPXKBFILELIB =
XKBFILELIB = -lxkbfile
LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
- XKBCOMPCMD = $(BINDIR)/xkbcomp
+ XKBCOMPCMD = $(XBINDIR)/xkbcomp
XKBUILIBSRC = $(LIBSRC)/xkbui
-DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a
+SOXKBUIREV = 1.0
+DEPXKBUILIB =
XKBUILIB = -lxkbui
LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln
+EXTRAXAWREQS = $(XPLIB)
+
+EXTRAXAWCLIENTDEPLIBS = $(DEPXPLIB)
+
+EXTRAXAWCLIENTLIBS = $(XPLIB)
+
XTRAPLIBSRC = $(LIBSRC)/XTrap
SOXTRAPREV = 6.4
@@ -701,16 +1020,21 @@
DEPLIBS9 = $(DEPLIBS)
DEPLIBS10 = $(DEPLIBS)
+ XFTPRELOADPATTERN = libXft.so.?
+ XRENDERPRELOADPATTERN = libXrender.so.?
+ XFONTPRELOADPATTERN = libXfont*.so.?
+
XMULIBONLY = -lXmu
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
CONFIGDIR = $(LIBDIR)/config
USRLIBDIRPATH = $(USRLIBDIR)
- LDPRELIBS = -L$(USRLIBDIR)
+ LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS)
LDPOSTLIBS =
TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES)
PROJECT_DEFINES =
+ VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"'
-DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"'
CXXPROJECT_DEFINES =
@@ -735,8 +1059,8 @@
# This isn't compiled in anywhere, it's just a convenience thing.
# BINDIR = /usr/local/bin/X11
-DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB)
$(EXTRAXAWCLIENTDEPLIBS) $(DEPXLIB)
+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB)
$(EXTRAXAWCLIENTLIBS) $(XLIB)
COMPRESSDEFS = -DUNCOMPRESS='"$(UNCOMPRESS)"'
-DUNCOMPRESSEXT='"$(UNCOMPRESSEXT)"'
@@ -748,17 +1072,11 @@
EXTRA_DEFINES = $(XrmFileFlag)
-SRCS = main.c options.c readfile.c game.c init.c widgets.c grades.c \
- frequency.c mainwindow.c search.c log.c utils.c kanasearch.c \
- convert.c multikanji.c kanjisearch.c strokesearch.c \
- searchwidgets.c prefs.c badguess.c skipsearch.c learn.c timeout.c
-
-OBJS = main.o options.o readfile.o game.o init.o widgets.o grades.o \
- frequency.o mainwindow.o search.o log.o utils.o kanasearch.o \
- convert.o multikanji.o kanjisearch.o strokesearch.o radsearch.o \
- searchwidgets.o prefs.o badguess.o skipsearch.o learn.o timeout.o
+SRCS = main.c options.c readfile.c game.c init.c widgets.c grades.c
frequency.c mainwindow.c search.c log.c utils.c kanasearch.c convert.c
multikanji.c kanjisearch.c strokesearch.c searchwidgets.c prefs.c
badguess.c skipsearch.c learn.c timeout.c
- PROGRAM = kdrill
+OBJS = main.o options.o readfile.o game.o init.o widgets.o grades.o
frequency.o mainwindow.o search.o log.o utils.o kanasearch.o convert.o
multikanji.o kanjisearch.o strokesearch.o radsearch.o searchwidgets.o
prefs.o badguess.o skipsearch.o learn.o timeout.o
+
+ PROGRAM = kdrill
all:: kdrill
@@ -768,12 +1086,12 @@
install:: kdrill
@if [ -d $(DESTDIR)$(BINDIR) ]; then \
- set +x; \
+ set +x; \
else \
- if [ -h $(DESTDIR)$(BINDIR) ]; then \
- (set -x; rm -f $(DESTDIR)$(BINDIR)); \
- fi; \
- (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \
+ if [ -h $(DESTDIR)$(BINDIR) ]; then \
+ (set -x; rm -f $(DESTDIR)$(BINDIR)); \
+ fi; \
+ (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) kdrill
$(DESTDIR)$(BINDIR)/kdrill
@@ -781,20 +1099,25 @@
kdrill.$(MANNEWSUFFIX): kdrill.$(MANSRCSUFFIX)
$(RM) $@
- cd `dirname kdrill` && \
- $(LN) `basename kdrill.$(MANSRCSUFFIX)` `basename [EMAIL PROTECTED]
+ if test -z "$(PREPROCESSMANPAGES)" ; then \
+ cd `dirname kdrill` && \
+ $(LN) `basename kdrill.$(MANSRCSUFFIX)` `basename [EMAIL PROTECTED];
\
+ else \
+ $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \
+ < kdrill.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d'
-e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[
]*XCOMM$$/s/XCOMM/#/' -e '/^[
]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[
]*XHASH/s/XHASH/#/' -e '/[EMAIL PROTECTED]@$$/s/[EMAIL
PROTECTED]@$$/\\/' >$@; \
+ fi
cleandir::
$(RM) kdrill.$(MANNEWSUFFIX)
install.man:: kdrill.$(MANNEWSUFFIX)
@if [ -d $(DESTDIR)$(MANDIR) ]; then \
- set +x; \
+ set +x; \
else \
- if [ -h $(DESTDIR)$(MANDIR) ]; then \
- (set -x; rm -f $(DESTDIR)$(MANDIR)); \
- fi; \
- (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \
+ if [ -h $(DESTDIR)$(MANDIR) ]; then \
+ (set -x; rm -f $(DESTDIR)$(MANDIR)); \
+ fi; \
+ (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) kdrill.$(MANNEWSUFFIX)
$(DESTDIR)$(MANDIR)/kdrill.$(MANSUFFIX)
@@ -811,29 +1134,26 @@
utils.o: utils.c
$(RM) $@
- $(CC) -c $(CFLAGS) $(COMPRESSDEFS) $*.c
+ $(CC) -c $(CFLAGS) $(COMPRESSDEFS) $*.c
init.o: init.c
$(RM) $@
- $(CC) -c $(CFLAGS) $(DICTDEFS) $(EDICTDEFS) $(RADDEFS) $*.c
+ $(CC) -c $(CFLAGS) $(DICTDEFS) $(EDICTDEFS) $(RADDEFS) $*.c
radsearch.o: radsearch.c
$(RM) $@
- $(CC) -c $(CFLAGS) $(RADDEFS) $*.c
+ $(CC) -c $(CFLAGS) $(RADDEFS) $*.c
install:: KDrill.ad
@if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \
- set +x; \
+ set +x; \
else \
- if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \
- (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \
- fi; \
- (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \
+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \
+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \
+ fi; \
+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \
fi
- @if [ -f $(DESTDIR)$(XAPPLOADDIR)/KDrill ]; then \
- echo "Not overwriting existing" $(DESTDIR)$(XAPPLOADDIR)/KDrill; \
- else set -x; \
- $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) KDrill.ad
$(DESTDIR)$(XAPPLOADDIR)/KDrill; fi
+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) KDrill.ad
$(DESTDIR)$(XAPPLOADDIR)/KDrill
all:: KDrill.ad
@@ -873,18 +1193,28 @@
.c.i:
$(RM) $@
- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+
+.SUFFIXES: .ii
+
+.cc.ii:
+ $(RM) $@
+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@
.SUFFIXES: .s
.c.s:
$(RM) $@
- $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c
+
+.cc.s:
+ $(RM) $@
+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc
emptyrule::
cleandir::
- $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut "#"*
+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut "#"*
Makefile::
[EMAIL PROTECTED] [ -f Makefile ]; then set -x; \
@@ -905,4 +1235,6 @@
distclean:: cleandir
+ PREPROCESSMANPAGES = true
+
# ----------------------------------------------------------------------
# empty rules for directories that do not have SUBDIRS - do not edit
@@ -923,7 +1255,7 @@
depend::
distclean::
- $(RM) Makefile
+ $(RM) Makefile Makefile.dep
# ----------------------------------------------------------------------
# dependencies generated by makedepend
diff -u kdrill-6.4/debian/dirs kdrill-6.4/debian/dirs
--- kdrill-6.4/debian/dirs
+++ kdrill-6.4/debian/dirs
@@ -1,3 +1,2 @@
-usr/X11R6/bin
usr/share/pixmaps
diff -u kdrill-6.4/debian/control kdrill-6.4/debian/control
--- kdrill-6.4/debian/control
+++ kdrill-6.4/debian/control
@@ -2,7 +2,7 @@
Section: text
Priority: optional
Maintainer: Philip Brown <[EMAIL PROTECTED]>
-Build-Depends: debhelper(>= 3.0.0), po-debconf, xutils (>= 4.0.2-4),
libxaw7-dev, libx11-dev, libxt-dev, x-dev
+Build-Depends: debhelper (>= 3.0.0), po-debconf, xutils-dev, libxaw7-dev,
libx11-dev, libxt-dev, x-dev
Standards-Version: 3.5.2
Package: kdrill
diff -u kdrill-6.4/debian/changelog kdrill-6.4/debian/changelog
--- kdrill-6.4/debian/changelog
+++ kdrill-6.4/debian/changelog
@@ -1,3 +1,12 @@
+kdrill (6.4-2.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Build-depend on xutils-dev for the X11R7 transition, and adjust the
+ packaging to use the FHS paths.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 22 Apr 2006 01:30:38 -0700
+
kdrill (6.4-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u kdrill-6.4/debian/kanadic.menu kdrill-6.4/debian/kanadic.menu
--- kdrill-6.4/debian/kanadic.menu
+++ kdrill-6.4/debian/kanadic.menu
@@ -2,19 +2,19 @@
title="Kata Drill" \
- command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/kata.edic.gz
-kdictfile none"\
+ command="/usr/bin/kdrill -edictfile /usr/share/edict/kata.edic.gz -kdictfile
none"\
icon="/usr/share/pixmaps/kdrill.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Kata+ Drill" \
- command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/kataplus.edic.gz
-kdictfile none"\
+ command="/usr/bin/kdrill -edictfile /usr/share/edict/kataplus.edic.gz
-kdictfile none"\
icon="/usr/share/pixmaps/kdrill.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Hira Drill" \
- command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/hira.edic.gz
-kdictfile none"\
+ command="/usr/bin/kdrill -edictfile /usr/share/edict/hira.edic.gz -kdictfile
none"\
icon="/usr/share/pixmaps/kdrill.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Hira+ Drill" \
- command="/usr/X11R6/bin/kdrill -edictfile /usr/share/edict/hiraplus.edic.gz
-kdictfile none"\
+ command="/usr/bin/kdrill -edictfile /usr/share/edict/hiraplus.edic.gz
-kdictfile none"\
icon="/usr/share/pixmaps/kdrill.xpm"
?package(kanadic):needs=X11 section=Games/Puzzles\
title="Full Kana+ Drill" \
- command="/usr/X11R6/bin/kdrill -edictfile
/usr/share/edict/fullkatahira.edic.gz -kdictfile none"\
+ command="/usr/bin/kdrill -edictfile /usr/share/edict/fullkatahira.edic.gz
-kdictfile none"\
icon="/usr/share/pixmaps/kdrill.xpm"
diff -u kdrill-6.4/debian/menu kdrill-6.4/debian/menu
--- kdrill-6.4/debian/menu
+++ kdrill-6.4/debian/menu
@@ -1,3 +1,3 @@
?package(kdrill):needs=X11 section=Apps/Text\
- title="KDrill" command="/usr/X11R6/bin/kdrill"\
+ title="KDrill" command="/usr/bin/kdrill"\
icon="/usr/share/pixmaps/kdrill.xpm"
signature.asc
Description: Digital signature
