--- xfaces-3.3.orig/Imakefile +++ xfaces-3.3/Imakefile @@ -65,7 +65,8 @@ # -DLOOKUP_DEBUG # #CDEBUGFLAGS= -Wall -g -#CDEBUGFLAGS= -g +#CDEBUGFLAGS= -g +CDEBUGFLAGS= -O3 #ifdef USE_XFACE XFACE_SRCS = face_search_xface.c face_image_xface.c --- xfaces-3.3.orig/Makefile +++ xfaces-3.3/Makefile @@ -1,282 +1,1043 @@ # Makefile generated by imake - do not edit! -# $XConsortium: imake.c,v 1.65 91/07/25 17:50:17 rws Exp $ -# -# The cpp used on this machine replaces all newlines and multiple tabs and -# spaces in a macro expansion with a single space. Imake tries to compensate -# for this, but is not always successful. -# -# ------------------------------------------------------------------------- -# Makefile generated from "Imake.tmpl" and -# $XConsortium: Imake.tmpl,v 1.139 91/09/16 08:52:48 rws Exp $ +# ---------------------------------------------------------------------- +# Makefile generated from "Imake.tmpl" and +# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ +# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $ +# # -# Platform-specific parameters may be set in the appropriate .cf -# configuration files. Site-specific parameters should be set in the file -# site.def. Full rebuilds are recommended if any parameters are changed. # -# If your C preprocessor does not define any unique symbols, you will need -# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing -# "make World" the first time). # +# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $ +# ---------------------------------------------------------------------- + +all:: + +.SUFFIXES: .i + +# $XdotOrg: xc/config/cf/Imake.cf,v 1.7 2005/03/02 11:20:29 gisburn 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 $ + +# ----------------------------------------------------------------------- # site-specific configuration parameters that need to come before # the platform-specific parameters - edit site.def to change -# site: $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $ +# 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 $ + +# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ + +# ---------------------------------------------------------------------- +# platform-specific configuration parameters - edit linux.cf to change + +# $XdotOrg: xc/config/cf/linux.cf,v 1.24 2005/03/06 01:05:00 branden Exp $ +# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + +# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ + +# operating system: Linux 3.16.0-4-amd64 x86_64 [ELF] (3.16.0) +# libc: (6.19.0) +# binutils: (225) + +# $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 $ + +# $XdotOrg: xc/config/cf/xorg.cf,v 1.44 2005/01/27 03:50:46 ajax Exp $ + +# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ + +XORG_VERSION_CURRENT = (((7) * 10000000) + ((7) * 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 $ -# ------------------------------------------------------------------------- -# platform-specific configuration parameters - edit sun.cf to change +# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ -# platform: $XConsortium: sun.cf,v 1.72.1.1 92/03/18 13:13:37 rws Exp $ + SELINUX_LDFLAGS = -# operating system: SunOS 4.1.1 + SELINUX_INCLUDES = -I/usr/include/selinux -# $XConsortium: sunLib.rules,v 1.7 91/12/20 11:19:47 rws Exp $ + SELINUX_CFLAGS = -DHAVE_SELINUX -.c.o: - $(CC) -c $(CFLAGS) $*.c + SELINUX_LIBS = -lselinux -# ------------------------------------------------------------------------- +# ---------------------------------------------------------------------- # site-specific configuration parameters that go after # the platform-specific parameters - edit site.def to change -# site: $XConsortium: site.def,v 1.2 91/07/30 20:26:44 rws Exp $ +# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ - SHELL = /bin/sh +# 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: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.8 2005/02/01 22:27:00 ajax 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 = + +GLIDE3INCDIR = /usr/include/glide3 + +GLIDE3LIBNAME = glide3 + +TKLIBNAME = tk8.4 + +TKLIBDIR = /usr/lib + +TCLLIBNAME = tcl8.4 + +TCLIBDIR = /usr/lib + + PATHSEP = / + SHELL = /bin/sh -e TOP = . CURRENT_DIR = . + IMAKE = imake + DEPEND = gccmakedep + MKDIRHIER = mkdir -p + REVPATH = revpath + EXPORTLISTGEN = + RMAN = /usr/bin/rman + RMANBASENAME = rman + RMANOPTIONS = + CONFIGSRC = $(TOP)/config + IMAKESRC = $(CONFIGSRC)/imake + DEPENDSRC = $(CONFIGSRC)/util + + INCROOT = /usr/include + USRLIBDIR = /usr/lib + VARDIR = /var + VARLIBDIR = $(VARDIR)/lib + SYSTEMUSRLIBDIR = /usr/lib + SYSTEMUSRINCDIR = /usr/include + SHLIBDIR = /usr/lib + LINTLIBDIR = $(USRLIBDIR)/lint + MANPATH = /usr/share/man + MANSOURCEPATH = $(MANPATH)/man + 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/share/icons" + XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps" + 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 -fstrength-reduce -fpcc-struct-return - AS = as + + CC = gcc + AS = gcc -c -x assembler + +.SUFFIXES: .cc + + CXX = c++ + + CXXFILT = c++filt + + CXXLIB = -lstdc++ + + CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing +CXXDEPENDINCLUDES = + CXXEXTRA_DEFINES = +CXXEXTRA_INCLUDES = + CXXSTD_DEFINES = -Dlinux -D__amd64__ -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) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) + CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) COMPRESS = compress - CPP = /lib/cpp $(STD_CPP_DEFINES) - PREPROCESSCMD = gcc -fstrength-reduce -fpcc-struct-return -E $(STD_CPP_DEFINES) + GZIPCMD = gzip + + CPP = cpp $(STD_CPP_DEFINES) + RAWCPP = cpp -undef $(STD_CPP_OPTIONS) + PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES) + INSTALL = install - LD = ld + INSTALLFLAGS = -c + + LD = gcc -nostdlib + + LEX = flex -l + M4 = m4 + M4FLAGS = + LEXLIB = -lfl + YACC = bison -y + CCYACC = bison -y + LINT = lint + LINTLIBFLAG = -C LINTOPTS = -axz LN = ln -s MAKE = make - MV = mv + MV = mv -f CP = cp RANLIB = ranlib + RANLIBINSTFLAGS = RM = rm -f - TROFF = psroff + 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 + + MODCPP = cpp + MODCFLAGS = $(CFLAGS) + MODAS = gcc -c -x assembler + MODASFLAGS = + + MODLD = gcc -nostdlib + + MODLDFLAGS = +MODLDCOMBINEFLAGS = -r + MODAR = ar clq + + MODRANLIB = ranlib + + DVIPS = dvips + LATEX = latex + STD_INCLUDES = - STD_CPP_DEFINES = - STD_DEFINES = - EXTRA_LOAD_FLAGS = -B/usr/bin/ + STD_CPP_OPTIONS = -traditional + STD_CPP_DEFINES = -traditional -Dlinux -D__amd64__ -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__amd64__ -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 = TAGS = ctags - SHAREDCODEDEF = -DSHAREDCODE - SHLIBDEF = -DSUNSHLIB + PARALLELMFLAGS = + + SHAREDCODEDEF = + SHLIBDEF = - PROTO_DEFINES = + SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + + PICFLAGS = -fPIC + + CXXPICFLAGS = -fPIC + + PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO INSTPGMFLAGS = INSTBINFLAGS = -m 0755 - INSTUIDFLAGS = -m 4755 + INSTUIDFLAGS = -m 4711 INSTLIBFLAGS = -m 0644 INSTINCFLAGS = -m 0444 INSTMANFLAGS = -m 0444 INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -g kmem -m 2755 - - PROJECTROOT = /usr/X11R5 + INSTKMEMFLAGS = -m 4711 - TOP_INCLUDES = -I$(INCROOT) + PROJECTROOT = /usr - CDEBUGFLAGS = -O + CDEBUGFLAGS = -g -O2 -fno-strict-aliasing CCOPTIONS = - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) +override CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = $(INSTALLED_LIBS) + LDPOSTLIB = + LDOPTIONS = $(LDFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(LOCAL_LDFLAGS) -L$(USRLIBDIR) + CCLINK = $(CC) - LDCOMBINEFLAGS = -X -r + 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 - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut + 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)/Imake.rules \ - $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ - $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) - -# ------------------------------------------------------------------------- -# X Window System Build Parameters -# $XConsortium: Project.tmpl,v 1.138.1.1 92/11/11 09:49:19 rws Exp $ + 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) -# ------------------------------------------------------------------------- -# X Window System make variables; this need to be coordinated with rules +# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ - PATHSEP = / - USRLIBDIR = /usr/X11R5/lib - BINDIR = /usr/X11R5/bin - INCROOT = /usr/X11R5/include - BUILDINCROOT = $(TOP) - BUILDINCDIR = $(BUILDINCROOT)/X11 - BUILDINCTOP = .. - INCDIR = $(INCROOT)/X11 - ADMDIR = /usr/adm - LIBDIR = $(USRLIBDIR)/X11 - CONFIGDIR = $(LIBDIR)/config - LINTLIBDIR = $(USRLIBDIR)/lint +# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ - FONTDIR = $(LIBDIR)/fonts +# ---------------------------------------------------------------------- +# X Window System Build Parameters and Rules +# $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 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 7 7 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANNAME = X Version 11 + +STICKY_DEFINES = -DHAS_STICKY_DIR_BIT + +FCHOWN_DEFINES = -DHAS_FCHOWN + +# ----------------------------------------------------------------------- +# X Window System make variables; these need to be coordinated with rules + + XTOP = $(TOP) + BINDIR = /usr/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 = /usr/lib/X11 + SHAREDIR = /usr/share/X11 + LIBEXECDIR = /usr/libexec + MODULEDIR = $(USRLIBDIR)/modules + TOP_X_INCLUDES = + XBINDIR = $(PROJECTROOT)/bin + + INSTSRCDIR = /usr/src + + ETCX11DIR = /etc/X11 + + CONFDIR = $(ETCX11DIR) + + DOCDIR = $(LIBDIR)/doc + DOCHTMLDIR = $(DOCDIR)/html + DOCPSDIR = $(DOCDIR)/PostScript + DOCPDFDIR = $(DOCDIR)/PDF + FONTDIR = ${datarootdir}/fonts/X11 + FONTROOTDIR = ${datarootdir}/fonts/X11 + ENCODINGSDIR = ${FONTROOTDIR}/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm + XDMVARDIR = $(VARLIBDIR)/xdm TWMDIR = $(LIBDIR)/twm - MANPATH = /usr/X11R5/man - MANSOURCEPATH = $(MANPATH)/man - MANSUFFIX = n - LIBMANSUFFIX = 3 - MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) - LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX) + XSMDIR = $(LIBDIR)/xsm NLSDIR = $(LIBDIR)/nls - 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) - IMAKE = imake - DEPEND = makedepend - RGB = rgb - - FONTC = bdftopcf + 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 - MKFONTDIR = mkfontdir - MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier + HTMLINDEXCMD = HtmlIndexCmd - CONFIGSRC = $(TOP)/config - DOCUTILSRC = $(TOP)/doc/util + DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients DEMOSRC = $(TOP)/demos - LIBSRC = $(TOP)/lib - FONTSRC = $(TOP)/fonts - INCLUDESRC = $(TOP)/X11 - SERVERSRC = $(TOP)/server - UTILSRC = $(TOP)/util - SCRIPTSRC = $(UTILSRC)/scripts - EXAMPLESRC = $(TOP)/examples - CONTRIBSRC = $(TOP)/../contrib - DOCSRC = $(TOP)/doc - RGBSRC = $(TOP)/rgb - DEPENDSRC = $(UTILSRC)/makedepend - IMAKESRC = $(CONFIGSRC) + XDOCMACROS = $(DOCUTILSRC)/macros.t + XIDXMACROS = $(DOCUTILSRC)/indexmacros.t + PROGRAMSRC = $(TOP)/programs + 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 = $(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 + + VENDORMANNAME = X.Org + VENDORMANVERSION = `echo 7 7 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 + + VENDORWEBSUPPORT = http://wiki.X.Org + +VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' + + XKBDEFRULES = xorg + XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"' + + XCONFIGFILE = xorg.conf + XCONFIGDIR = $(LIBDIR) + XLOGFILE = Xorg + XSERVERNAME = Xorg + + XENVLIBDIR = $(USRLIBDIR) + CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) XLOCALEDIR=$(BUILDLIBDIR)/locale + +# $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 = 6.2 +DEPXONLYLIB = +XONLYLIB = -lX11 + +LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln + + DEPXLIBONLY = $(DEPXONLYLIB) + XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) + + XEXTLIBSRC = $(LIBSRC)/Xext + +SOXEXTREV = 6.4 +DEPEXTENSIONLIB = +EXTENSIONLIB = -lXext + +LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln + +LINTEXTENSIONLIB = $(LINTEXTENSION) + DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) + XLIB = $(EXTENSIONLIB) $(XONLYLIB) + LINTXLIB = $(LINTXONLYLIB) + + XSSLIBSRC = $(LIBSRC)/Xss + +SOXSSREV = 1.0 +DEPXSSLIB = +XSSLIB = -lXss + +LINTXSS = $(LINTLIBDIR)/llib-lXss.ln + + XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc + +SOXXF86MISCREV = 1.1 +DEPXXF86MISCLIB = +XXF86MISCLIB = -lXxf86misc + +LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln + + XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm + +SOXXF86VMREV = 1.0 +DEPXXF86VMLIB = +XXF86VMLIB = -lXxf86vm + +LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln + + XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga + +SOXXF86DGAREV = 1.0 +DEPXXF86DGALIB = +XXF86DGALIB = -lXxf86dga + +LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln + + XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush + +SOXXF86RUSHREV = 1.0 +DEPXXF86RUSHLIB = +XXF86RUSHLIB = -lXxf86rush + +LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln + + XVLIBSRC = $(LIBSRC)/Xv + +SOXVREV = 1.0 +DEPXVLIB = +XVLIB = -lXv + +LINTXV = $(LINTLIBDIR)/llib-lXv.ln + + XVMCLIBSRC = $(LIBSRC)/XvMC + +SOXVMCREV = 1.0 +DEPXVMCLIB = +XVMCLIB = -lXvMC + +LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln + + XINERAMALIBSRC = $(LIBSRC)/Xinerama + +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 + +DEPDPSLIB = $(USRLIBDIR)/libdps.a +DPSLIB = -ldps + +LINTDPS = $(LINTLIBDIR)/llib-ldps.ln + + DPSTKLIBSRC = $(LIBSRC)/dpstk + +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a +DPSTKLIB = -ldpstk + +LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln + + PSRESLIBSRC = $(LIBSRC)/psres + +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a +PSRESLIB = -lpsres + +LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln + + GLULIBSRC = $(LIBSRC)/GLU + +SOGLUREV = 1.3 +DEPGLULIB = +GLULIB = -lGLU + +LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln + + GLXLIBSRC = $(LIBSRC)/GL + +SOGLREV = 1.2 +DEPGLXLIB = +GLXLIB = -lGL + +LINTGLX = $(LINTLIBDIR)/llib-lGL.ln + + GLWIDGETSRC = $(LIBSRC)/GLw + +DEPGLWLIB = $(USRLIBDIR)/libGLw.a +GLWLIB = -lGLw + +LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln + +XRENDERDIR = /usr +XRENDERLIBDIR = /usr/lib +XRENDERINCDIR = /usr/include +XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender +DEPXRENDERLIB = + +XRENDERINCLUDES = -I$(XRENDERINCDIR) + + XRANDRLIBSRC = $(LIBSRC)/Xrandr + +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 +XFONTCACHELIB = -lXfontcache + +LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln + XAUTHSRC = $(LIBSRC)/Xau - XLIBSRC = $(LIBSRC)/X + +SOXAUTHREV = 6.0 +DEPXAUTHLIB = +XAUTHLIB = -lXau + +LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln + + XDMCPLIBSRC = $(LIBSRC)/Xdmcp + +SOXDMCPREV = 6.0 +DEPXDMCPLIB = +XDMCPLIB = -lXdmcp + +LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln + XMUSRC = $(LIBSRC)/Xmu + +SOXMUREV = 6.2 +DEPXMULIB = +XMULIB = -lXmu + +LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln + + XMUUSRC = $(LIBSRC)/Xmuu + +SOXMUUREV = 1.0 +DEPXMUULIB = +XMUULIB = -lXmuu + +LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln + + OLDXLIBSRC = $(LIBSRC)/oldX + +DEPOLDXLIB = $(USRLIBDIR)/liboldX.a +OLDXLIB = -loldX + +LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln + + XPLIBSRC = $(LIBSRC)/Xp + +SOXPREV = 6.2 +DEPXPLIB = +XPLIB = -lXp + +LINTXP = $(LINTLIBDIR)/llib-lXp.ln + TOOLKITSRC = $(LIBSRC)/Xt + +SOXTREV = 6.0 +DEPXTOOLONLYLIB = +XTOOLONLYLIB = -lXt + +LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln + + DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) + XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) + LINTXTOOLLIB = $(LINTXTOOLONLYLIB) + + XALIBSRC = $(LIBSRC)/Xa + +SOXAREV = 1.0 +DEPXALIB = +XALIB = -lXa + +LINTXA = $(LINTLIBDIR)/llib-lXa.ln + AWIDGETSRC = $(LIBSRC)/Xaw - OLDXLIBSRC = $(LIBSRC)/oldX - XDMCPLIBSRC = $(LIBSRC)/Xdmcp - BDFTOSNFSRC = $(FONTSRC)/bdftosnf - BDFTOSNFSRC = $(FONTSRC)/clients/bdftosnf - BDFTOPCFSRC = $(FONTSRC)/clients/bdftopcf - MKFONTDIRSRC = $(FONTSRC)/clients/mkfontdir - FSLIBSRC = $(FONTSRC)/lib/fs - FONTSERVERSRC = $(FONTSRC)/server - EXTENSIONSRC = $(TOP)/extensions - XILIBSRC = $(EXTENSIONSRC)/lib/xinput - PEXLIBSRC = $(EXTENSIONSRC)/lib/PEXlib - PHIGSLIBSRC = $(EXTENSIONSRC)/lib/PEX - -# $XConsortium: sunLib.tmpl,v 1.14.1.2 92/11/11 09:55:02 rws Exp $ - -SHLIBLDFLAGS = -assert pure-text -PICFLAGS = -pic - - DEPEXTENSIONLIB = - EXTENSIONLIB = -lXext - - DEPXLIB = $(DEPEXTENSIONLIB) - XLIB = $(EXTENSIONLIB) -lX11 - - DEPXMULIB = $(USRLIBDIR)/libXmu.sa.$(SOXMUREV) - XMULIBONLY = -lXmu - XMULIB = -lXmu - - DEPOLDXLIB = - OLDXLIB = -loldX - - DEPXTOOLLIB = $(USRLIBDIR)/libXt.sa.$(SOXTREV) - XTOOLLIB = -lXt - - DEPXAWLIB = $(USRLIBDIR)/libXaw.sa.$(SOXAWREV) - XAWLIB = -lXaw - - DEPXILIB = - XILIB = -lXi - - DEPPEXLIB = - PEXLIB = -lPEX5 - - SOXLIBREV = 4.10 - SOXTREV = 4.10 - SOXAWREV = 5.0 - SOOLDXREV = 4.10 - SOXMUREV = 4.10 - SOXEXTREV = 4.10 - SOXINPUTREV = 4.10 - SOPEXREV = 1.0 - - DEPXAUTHLIB = $(USRLIBDIR)/libXau.a - XAUTHLIB = -lXau - DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a - XDMCPLIB = -lXdmcp - - DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a - PHIGSLIB = -lphigs - - DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a - XBSDLIB = -lXbsd - - LINTEXTENSIONLIB = $(LINTLIBDIR)/llib-lXext.ln - LINTXLIB = $(LINTLIBDIR)/llib-lX11.ln - LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln - LINTXTOOL = $(LINTLIBDIR)/llib-lXt.ln - LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln - LINTXI = $(LINTLIBDIR)/llib-lXi.ln - LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln - LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln + +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 +DEPXAW6LIB = +XAW6LIB = -lXaw + +LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln + + XILIBSRC = $(LIBSRC)/Xi + +SOXINPUTREV = 6.0 +DEPXILIB = +XILIB = -lXi + +LINTXI = $(LINTLIBDIR)/llib-lXi.ln + + XTESTLIBSRC = $(LIBSRC)/Xtst + +SOXTESTREV = 6.1 +DEPXTESTLIB = +XTESTLIB = -lXtst + +LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln + +DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a +XBSDLIB = -lXbsd + +LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln + + ICESRC = $(LIBSRC)/ICE + +SOICEREV = 6.4 +DEPICELIB = +ICELIB = -lICE + +LINTICE = $(LINTLIBDIR)/llib-lICE.ln + + SMSRC = $(LIBSRC)/SM + +SOSMREV = 6.0 +DEPSMLIB = +SMLIB = -lSM + +LINTSM = $(LINTLIBDIR)/llib-lSM.ln + + XKEYSRC = $(LIBSRC)/Xkey + +SOXKEYREV = 6.0 +DEPXKEYLIB = +XKEYLIB = -lXkey + +LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln + + FSLIBSRC = $(LIBSRC)/FS + +SOFSREV = 6.0 +DEPFSLIB = +FSLIB = -lFS + +LINTFS = $(LINTLIBDIR)/llib-lFS.ln + + FONTLIBSRC = $(LIBSRC)/font + +DEPFONTLIB = $(USRLIBDIR)/libXfont.a +FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln +# +DEPXFONTLIB = $(USRLIBDIR)/libXfont.a +XFONTLIB = -lXfont + +LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln + + FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs + +DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a +FONTSTUBLIB = -lfntstubs + +LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln + DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) + FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) + + FONTENCLIBSRC = $(LIBSRC)/fontenc + +DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a +XFONTENCLIB = -lfontenc + +LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln + + XPMLIBSRC = $(LIBSRC)/Xpm + +SOXPMREV = 4.11 +DEPXPMLIB = +XPMLIB = -lXpm + +LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln + +FREETYPE2DIR = /usr +FREETYPE2LIBDIR = /usr/lib +FREETYPE2INCDIR = /usr/include + +FREETYPE2LIB = -lfreetype + +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config + +FREETYPE2DEFINES = -DFREETYPE2 + + 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 + +FONTCONFIGLIB = -lfontconfig + +FONTCONFIGINCLUDES = + +FCCACHE = $(FONTCONFIGBINDIR)/fc-cache + +FONTCONFIGDEFINES = -DFONTCONFIG + +LIBPNGINCDIR = /usr/include + +LIBPNGINC= + +LIBPNGDIR = /usr +LIBPNGLIBDIR = /usr/lib +LIBPNGINCDIR = /usr/include + +LIBPNGLIB = -lpng + + XKBFILELIBSRC = $(LIBSRC)/xkbfile + +SOXKBFILEREV = 1.0 +DEPXKBFILELIB = +XKBFILELIB = -lxkbfile + +LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln + + XKBCOMPCMD = $(XBINDIR)/xkbcomp + + XKBUILIBSRC = $(LIBSRC)/xkbui + +SOXKBUIREV = 1.0 +DEPXKBUILIB = +XKBUILIB = -lxkbui + +LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln + +EXTRAXAWREQS = + +EXTRAXAWCLIENTDEPLIBS = + +EXTRAXAWCLIENTLIBS = + + XTRAPLIBSRC = $(LIBSRC)/XTrap + +SOXTRAPREV = 6.4 +DEPXTRAPLIB = +XTRAPLIB = -lXTrap + +LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) DEPLIBS1 = $(DEPLIBS) DEPLIBS2 = $(DEPLIBS) DEPLIBS3 = $(DEPLIBS) + DEPLIBS4 = $(DEPLIBS) + DEPLIBS5 = $(DEPLIBS) + DEPLIBS6 = $(DEPLIBS) + DEPLIBS7 = $(DEPLIBS) + DEPLIBS8 = $(DEPLIBS) + DEPLIBS9 = $(DEPLIBS) + DEPLIBS10 = $(DEPLIBS) + + XFTPRELOADPATTERN = libXft.so.? + XRENDERPRELOADPATTERN = libXrender.so.? + XFONTPRELOADPATTERN = libXfont*.so.? -# ------------------------------------------------------------------------- -# Imake rules for building libraries, programs, scripts, and data files -# rules: $XConsortium: Imake.rules,v 1.123 91/09/16 20:12:16 rws Exp $ +XMULIBONLY = -lXmu +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) + + CONFIGDIR = $(LIBDIR)/config + + USRLIBDIRPATH = $(USRLIBDIR) + LDPRELIBS = $(INSTALLED_LIBS) + LDPOSTLIBS = + TOP_INCLUDES = $(TOP_X_INCLUDES) + PROJECT_DEFINES = + VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' -# ------------------------------------------------------------------------- +CXXPROJECT_DEFINES = + +# ---------------------------------------------------------------------- # start of Imakefile # @@ -317,29 +1078,30 @@ # -DITEM_DEBUG # -DLOOKUP_DEBUG # -#CDEBUGFLAGS= -Wall -g -#CDEBUGFLAGS= -g +# CDEBUGFLAGS= -Wall -g +# CDEBUGFLAGS= -g +CDEBUGFLAGS= -O3 XFACE_SRCS = face_search_xface.c face_image_xface.c XFACE_OBJS = face_search_xface.o face_image_xface.o XFACE_DEFS = -DXFACE -#XFACE_LIBS = -L../compface -lcompface +# XFACE_LIBS = -L../compface -lcompface XFACE_LIBS = -L/usr/local/lib -lcompface XPM_SRCS = face_image_xpm.c XPM_OBJS = face_image_xpm.o XPM_INCL = -#XPL_INCL = -I/usr/xpm/include +# XPL_INCL = -I/usr/xpm/include XPM_LIBS = -lXpm -#XPM_LIBS = -L/usr/xpm/lib -lXpm +# XPM_LIBS = -L/usr/xpm/lib -lXpm XPM_DEFS = -DXPM SOUND_SRCS = face_sound.c SOUND_OBJS = face_sound.o SOUND_INCL = -#SOUND_INCL = -I/usr/audio/include +# SOUND_INCL = -I/usr/audio/include SOUND_LIBS = -laudio -#SOUND_LIBS = -L/usr/audio/lib -laudio +# SOUND_LIBS = -L/usr/audio/lib -laudio SOUND_DEFS = -DSOUND -DUSE_BUCKETS @@ -363,198 +1125,168 @@ XFACES_VERSION_TAG= -HDRS = Tiled.h \ - TiledP.h \ - faces.h \ - face_command.h \ - face_image.h \ - face_search.h \ - face_sound.h \ - patchlevel.h \ - regexp.h \ - regmagic.h \ - $(XFACE_HDRS) - -SRCS = Tiled.c \ - cmd_check.c \ - face_actions.c \ - face_annotate.c \ - face_binding.c \ - face_command.c \ - face_display.c \ - face_image.c \ - face_image_xbm.c \ - face_search.c \ - face_search_binding.c \ - face_search_facedb.c \ - face_search_resource.c \ - face_search_uh.c \ - mail_box.c \ - mail_body.c \ - mail_check.c \ - mail_file.c \ - mail_header.c \ - mail_items.c \ - mail_parse.c \ - main.c \ - path.c \ - regexp.c \ - regsub.c \ - string.c \ - $(SOUND_SRCS) $(XPM_SRCS) $(SHAPE_SRCS) $(XFACE_SRCS) $(POP_SRCS) \ - $(LHN_OBJS) - -OBJS = Tiled.o \ - cmd_check.o \ - face_actions.o \ - face_annotate.o \ - face_binding.o \ - face_command.o \ - face_display.o \ - face_image.o \ - face_image_xbm.o \ - face_search.o \ - face_search_binding.o \ - face_search_facedb.o \ - face_search_resource.o \ - face_search_uh.o \ - mail_box.o \ - mail_body.o \ - mail_check.o \ - mail_file.o \ - mail_header.o \ - mail_items.o \ - mail_parse.o \ - main.o \ - path.o \ - regexp.o \ - regsub.o \ - string.o \ - $(SOUND_OBJS) $(XPM_OBJS) $(SHAPE_OBJS) $(XFACE_OBJS) $(POP_OBJS) \ - $(LHN_OBJS) - -OTHER_FILES = BLURB README CHANGES CREDITS TODO COPYRIGHT ChangeLog \ - Imakefile XFaces.ad xfaces.man ausun.patch \ - Makefile.noimake +HDRS = Tiled.h TiledP.h faces.h face_command.h face_image.h face_search.h face_sound.h patchlevel.h regexp.h regmagic.h $(XFACE_HDRS) + +SRCS = Tiled.c cmd_check.c face_actions.c face_annotate.c face_binding.c face_command.c face_display.c face_image.c face_image_xbm.c face_search.c face_search_binding.c face_search_facedb.c face_search_resource.c face_search_uh.c mail_box.c mail_body.c mail_check.c mail_file.c mail_header.c mail_items.c mail_parse.c main.c path.c regexp.c regsub.c string.c $(SOUND_SRCS) $(XPM_SRCS) $(SHAPE_SRCS) $(XFACE_SRCS) $(POP_SRCS) $(LHN_OBJS) + +OBJS = Tiled.o cmd_check.o face_actions.o face_annotate.o face_binding.o face_command.o face_display.o face_image.o face_image_xbm.o face_search.o face_search_binding.o face_search_facedb.o face_search_resource.o face_search_uh.o mail_box.o mail_body.o mail_check.o mail_file.o mail_header.o mail_items.o mail_parse.o main.o path.o regexp.o regsub.o string.o $(SOUND_OBJS) $(XPM_OBJS) $(SHAPE_OBJS) $(XFACE_OBJS) $(POP_OBJS) $(LHN_OBJS) + +OTHER_FILES = BLURB README CHANGES CREDITS TODO COPYRIGHT ChangeLog Imakefile XFaces.ad xfaces.man ausun.patch Makefile.noimake + IMAGEDIR = images -INCLUDES = $(TOP_INCLUDES) $(SOUND_INCL) \ - $(XPM_INCL) $(SHAPE_INCL) $(POP_INCL) $(LHN_INCL) +INCLUDES = $(TOP_INCLUDES) $(SOUND_INCL) $(XPM_INCL) $(SHAPE_INCL) $(POP_INCL) $(LHN_INCL) + SYS_LIBRARIES = $(SOUND_LIBS) -lm # # # You will need to add -lnsl and -lsocket on some Solaris2 systems using # openwindows. You may even need to add a -L/usr/openwin/lib before -# the $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) also. +# the $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) also. # -LOCAL_LIBRARIES = $(XPM_LIBS) $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(XFACE_LIBS) $(POP_LIBS) \ - $(LHN_LIBS) -DEFINES = $(SOUND_DEFS) $(XPM_DEFS) $(SHAPE_DEFS) \ - $(XFACE_DEFS) $(POP_DEFS) $(LHN_DEFS) +LOCAL_LIBRARIES = $(XPM_LIBS) $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) $(XFACE_LIBS) $(POP_LIBS) $(LHN_LIBS) + +DEFINES = $(SOUND_DEFS) $(XPM_DEFS) $(SHAPE_DEFS) $(XFACE_DEFS) $(POP_DEFS) $(LHN_DEFS) - PROGRAM = xfaces + PROGRAM = xfaces all:: xfaces xfaces: $(OBJS) $(DEPLIBS) $(RM) $@ - $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) + $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) -saber_xfaces:: $(SRCS) - # load $(ALLDEFINES) $(SRCS) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) +install:: xfaces + @if [ -d $(DESTDIR)$(BINDIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(BINDIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(BINDIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \ + fi + $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xfaces $(DESTDIR)$(BINDIR)/xfaces -osaber_xfaces:: $(OBJS) - # load $(ALLDEFINES) $(OBJS) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) +all:: xfaces.$(MANNEWSUFFIX) -install:: xfaces - @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi - $(INSTALL) -c $(INSTPGMFLAGS) xfaces $(DESTDIR)$(BINDIR) - -install.man:: xfaces.man - @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi - $(INSTALL) -c $(INSTMANFLAGS) xfaces.man $(DESTDIR)$(MANDIR)/xfaces.$(MANSUFFIX) +xfaces.$(MANNEWSUFFIX): xfaces.$(MANSRCSUFFIX) + $(RM) $@ + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname xfaces` && \ + $(LN) `basename xfaces.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < xfaces.$(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 '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi + +cleandir:: + $(RM) xfaces.$(MANNEWSUFFIX) + +install.man:: xfaces.$(MANNEWSUFFIX) + @if [ -d $(DESTDIR)$(MANDIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(MANDIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(MANDIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \ + fi + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xfaces.$(MANNEWSUFFIX) $(DESTDIR)$(MANDIR)/xfaces.$(MANSUFFIX) depend:: - $(DEPEND) $(DEPENDFLAGS) -s "# DO NOT DELETE" -- $(ALLDEFINES) -- $(SRCS) + $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) lint: $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS) lint1: $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS) -clean:: - $(RM) $(PROGRAM) +cleandir:: + $(RM) xfaces install:: XFaces.ad - @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); fi - $(INSTALL) -c $(INSTAPPFLAGS) XFaces.ad $(DESTDIR)$(XAPPLOADDIR)/XFaces - -install.man:: xfaces.man - @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ - else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi - $(INSTALL) -c $(INSTMANFLAGS) xfaces.man $(DESTDIR)$(MANDIR)/xfaces.$(MANSUFFIX) + @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ + fi + $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XFaces.ad $(DESTDIR)$(XAPPLOADDIR)/XFaces + +all:: xfaces.$(MANNEWSUFFIX) + +xfaces.$(MANNEWSUFFIX): xfaces.$(MANSRCSUFFIX) + $(RM) $@ + if test -z "$(PREPROCESSMANPAGES)" ; then \ + cd `dirname xfaces` && \ + $(LN) `basename xfaces.$(MANSRCSUFFIX)` `basename $@`; \ + else \ + $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ + < xfaces.$(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 '/\@\@$$/s/\@\@$$/\\/' >$@; \ + fi + +cleandir:: + $(RM) xfaces.$(MANNEWSUFFIX) + +install.man:: xfaces.$(MANNEWSUFFIX) + @if [ -d $(DESTDIR)$(MANDIR) ]; then \ + set +x; \ + else \ + if [ -h $(DESTDIR)$(MANDIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(MANDIR)); \ + fi; \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \ + fi + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xfaces.$(MANNEWSUFFIX) $(DESTDIR)$(MANDIR)/xfaces.$(MANSUFFIX) # # A bit of a hack to make life easier. # distribution: - (set -x;THIS_PLACE=`pwd`; \ - export THIS_PLACE; \ - if [ -z "$(XFACES_VERSION)" ]; then \ - XFV=`grep XFACES_VERSION patchlevel.h|awk '{print $$3}'`; \ - else \ - XFV=$(XFACES_VERSION);\ - fi; \ - XFT=XFACES_`echo $$XFV | sed 's/\./_/'`; \ - export XFT; \ - mkdir -p Distribution/xfaces-$$XFV; \ - cd Distribution/xfaces-$$XFV; \ - ln -s $$THIS_PLACE/RCS; \ - co -r$$XFT Imakefile; \ - xmkmf; \ - make XFACES_VERSION_TAG=$$XFT current; \ - rm RCS; \ - mkdir -p $(IMAGEDIR); \ - (cd $(IMAGEDIR); \ - ln -s $$THIS_PLACE/$(IMAGEDIR)/RCS; \ - co -r$$XFT Imakefile; \ - xmkmf; \ - make XFACES_VERSION_TAG=$$XFT current; \ - rm -f Makefile Makefile.bak Imakefile RCS); \ - cd ..; \ - tar cvf xfaces-$$XFV.tar xfaces-$$XFV; \ - compress xfaces-$$XFV.tar) + (set -x;THIS_PLACE=`pwd`; export THIS_PLACE; if [ -z "$(XFACES_VERSION)" ]; then XFV=`grep XFACES_VERSION patchlevel.h|awk '{print $$3}'`; else XFV=$(XFACES_VERSION); fi; XFT=XFACES_`echo $$XFV | sed 's/\./_/'`; export XFT; mkdir -p Distribution/xfaces-$$XFV; cd Distribution/xfaces-$$XFV; ln -s $$THIS_PLACE/RCS; co -r$$XFT Imakefile; xmkmf; make XFACES_VERSION_TAG=$$XFT current; rm RCS; mkdir -p $(IMAGEDIR); (cd $(IMAGEDIR); ln -s $$THIS_PLACE/$(IMAGEDIR)/RCS; co -r$$XFT Imakefile; xmkmf; make XFACES_VERSION_TAG=$$XFT current; rm -f Makefile Makefile.bak Imakefile RCS); cd ..; tar cvf xfaces-$$XFV.tar xfaces-$$XFV; compress xfaces-$$XFV.tar) current: co -r$(XFACES_VERSION_TAG) $(HDRS) $(SRCS) $(OTHER_FILES) tag: - if [ ! -z "$(XFACES_VERSION_TAG)" ]; then \ - for i in $(HDRS) $(SRCS) $(OTHER_FILES);do \ - head=`rlog -h $$i | grep '^head' | awk '{print $$2}'`; \ - rcs -N$(XFACES_VERSION_TAG):$$head $$i; \ - done; \ - (cd $(IMAGEDIR); \ - make XFACES_VERSION_TAG=$(XFACES_VERSION_TAG) tag); \ - fi + if [ ! -z "$(XFACES_VERSION_TAG)" ]; then for i in $(HDRS) $(SRCS) $(OTHER_FILES);do head=`rlog -h $$i | grep '^head' | awk '{print $$2}'`; rcs -N$(XFACES_VERSION_TAG):$$head $$i; done; (cd $(IMAGEDIR); make XFACES_VERSION_TAG=$(XFACES_VERSION_TAG) tag); fi files: @echo $(HDRS) $(SRCS) $(OTHER_FILES) -clean:: +cleandir:: rm -rf Distribution -# ------------------------------------------------------------------------- +# ---------------------------------------------------------------------- # common rules for all Makefiles - do not edit +.c.i: + $(RM) $@ + $(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: + $(RM) $@ + $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc + emptyrule:: -clean:: - $(RM_CMD) "#"* +cleandir:: + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: -@if [ -f Makefile ]; then set -x; \ @@ -566,13 +1298,17 @@ $(TAGS) -w *.[ch] $(TAGS) -xw *.[ch] > TAGS -saber: - # load $(ALLDEFINES) $(SRCS) +man_keywords:: + +html_index:: + +clean:: cleandir -osaber: - # load $(ALLDEFINES) $(OBJS) +distclean:: cleandir -# ------------------------------------------------------------------------- + PREPROCESSMANPAGES = true + +# ---------------------------------------------------------------------- # empty rules for directories that do not have SUBDIRS - do not edit install:: @@ -581,10 +1317,18 @@ install.man:: @echo "install.man in $(CURRENT_DIR) done" +install.sdk:: + @echo "install.sdk in $(CURRENT_DIR) done" + Makefiles:: includes:: -# ------------------------------------------------------------------------- +depend:: + +distclean:: + $(RM) Makefile Makefile.dep + +# ---------------------------------------------------------------------- # dependencies generated by makedepend --- xfaces-3.3.orig/XFaces.ad +++ xfaces-3.3/XFaces.ad @@ -72,7 +72,7 @@ ! XFaces.soundPath: /usr/sounds:/usr/demo/SOUND/sounds -XFaces.imagePath: /usr/images +XFaces.imagePath: /usr/share/xfaces/images ! ! This is where we look for sounds/images in the "faces" format. @@ -100,7 +100,7 @@ ! image types are set in the imageTypes resource. ! -XFaces.facedbPath: /usr/faces +XFaces.facedbPath: /usr/share/picons/:/usr/share/picons/users:/usr/share/picons/domains:/usr/share/picons/unknown ! ! Tell how many different annotations there are. We can support any number. @@ -244,7 +244,7 @@ ! weather.listCommand: wx.faces wbc -weather.facedbPath: /usr/faces/weather +weather.facedbPath: /usr/lib/picon/weather weather.compressImages: False weather.keepOrder: True weather.shapeExtra: False @@ -300,9 +300,9 @@ ! XFaces.frame.Label.translations: :PlaySounds()\n\ - :CheckMail()\n\ + :CheckMail()\n\ :RunCommands() -XFaces.frame.translations: :CheckMail() +XFaces.frame.translations: :CheckMail() ! --- xfaces-3.3.orig/cmd_check.c +++ xfaces-3.3/cmd_check.c @@ -42,6 +42,7 @@ #include "faces.h" #include +#include static char* buffer = NULL; static int buffer_size = 0; --- xfaces-3.3.orig/debian/changelog +++ xfaces-3.3/debian/changelog @@ -0,0 +1,236 @@ +xfaces (3.3-30.1) unstable; urgency=high + + * Non-maintainer upload + * Drop suspicious 1 and alla.db files (closes: #1049887) + + -- Bastian Germann Tue, 26 Mar 2024 12:22:11 +0000 + +xfaces (3.3-30) unstable; urgency=low + + * Add some missing includes (closes: #1066259) + + -- Hakan Ardo Fri, 22 Mar 2024 13:51:46 +0100 + +xfaces (3.3-29) unstable; urgency=low + + * Migrate to debhelper compat level 9 (closes: #800191) + * Build using dpkg-buildflags + * Applied patch by Chris Lamb to removes timestamps + and thereby make xfaces build reproducibly (closes: #777063) + + -- Hakan Ardo Wed, 18 Nov 2015 21:44:41 +0100 + +xfaces (3.3-28) unstable; urgency=low + + * Renamed debian/patches to debian/patcheslist (closes: #538681) + * Removed builddep on rman (closes: #492133) + + -- Hakan Ardo Sun, 21 Feb 2010 11:29:27 +0100 + +xfaces (3.3-27) unstable; urgency=low + + * Replaced buildep on x-dev with x11proto-core-dev (closes: #515472) + * Added buildep xutils-dev (closes: #527507) + * Removed buildep on xutils + + -- Hakan Ardo Mon, 08 Jun 2009 14:56:53 +0200 + +xfaces (3.3-26) unstable; urgency=low + + * Applied patch from Aaron M. Ucko fixing X11R7 + transaction + + -- Hakan Ardo Sun, 30 Apr 2006 09:58:38 +0200 + +xfaces (3.3-25) unstable; urgency=low + + * Applied patch from Justin Pryzby that + updates build-deps for xlibs-dev removal; closes: #346812. + + -- Hakan Ardo Wed, 18 Jan 2006 07:59:16 +0100 + +xfaces (3.3-24) unstable; urgency=low + + * Rebuilt with correct xlibs (closes: #301154) + * Proper file premitions now generated + + -- Hakan Ardo Fri, 25 Mar 2005 11:49:06 +0100 + +xfaces (3.3-22) unstable; urgency=low + + * Applied patch from Sam Vilain making xfaces use TOP + POP3 command instead of RETR (closes: #261454) + * Fixed manpage section in .TH header + * Added section and priority fileds to binary package + + -- Hakan Ardo Sat, 19 Mar 2005 16:39:06 +0100 + +xfaces (3.3-21) unstable; urgency=low + + * Applied patch-robh fixing useContentLength resource + * New picons path in app-defaults + * Improved description layout (closes: #164275) + * Changed builddepnd of libxaw to libxaw7-dev (closes: #170009) + * Now checks for new mail on Button2Up instead of Button2Down, patch + by Neil Brown , (closes: #191354) + * Removed some copyrighted images (closes: #204490) + * No more usr/doc link + * Bin now striped + * Fixed typos in copyright + + -- Hakan Ardo Sun, 10 Aug 2003 13:42:42 +0200 + +xfaces (3.3-20) unstable; urgency=low + + * Added NMU patch + + -- Hakan Ardo Sun, 9 Feb 2002 12:58:07 +0200 + +xfaces (3.3-19.1) unstable; urgency=low + + * Non-maintainer upload. + * Make /etc/X11/app-defaults/XFaces a conffile (closes: #132093). + * Clean debian/substvars. + + -- Colin Watson Sat, 9 Feb 2002 00:04:36 +0000 + +xfaces (3.3-19) unstable; urgency=low + + * Added xutils to build dependencies (Bug#88732) + + -- Hakan Ardo Tue, 6 Mar 2001 15:06:09 +0100 + +xfaces (3.3-18) unstable; urgency=low + + * Added Build-Depends + * Now builds with -O3 instaed of -g + + -- Hakan Ardo Fri, 2 Mar 2001 18:27:29 +0100 + +xfaces (3.3-17) unstable; urgency=low + + * app-delafuts moved to /etc (Bug#78198) + + -- Hakan Ardo Sat, 30 Dec 2000 15:40:11 +0100 + +xfaces (3.3-16) unstable; urgency=low + + * Source pkg now chmods postinst and prerm executable (Bug #69100) + + -- Hakan Ardo Sun, 29 Oct 2000 13:22:20 +0100 + +xfaces (3.3-15) unstable; urgency=low + + * Recompiled to updated dependency on xpm4g to libxpm4 (Bug #67947) + * Moved docs to /usr/share + + -- Hakan Ardo Mon, 7 Aug 2000 19:08:57 +0200 + +xfaces (3.3-14) unstable; urgency=low + + * Reuploded, now with .orig and diff file (Bug #44230) + + -- Hakan Ardo Mon, 7 Aug 2000 18:49:08 +0200 + +xfaces (3.3-13) unstable; urgency=low + + * xpm images are now displayed shaped too (Bug #21199) + * Dependency on picons downgraded to a suggestion (Bug #24615) + * Applied Roman Hodek patch + which fixes (Bug #24122): + + Need to re-run imake before building, because Makefile included in + package still linked with libXExExt which doesn't exist anymore. + + Don't copy debian/conffiles unconditionally, because it doesn't exist + in the current source tree. I've seen that conffiles is empty in the + i386 .deb, so create an empty file for it. + + -- Hakan Ardo Thu, 2 Jul 1998 19:10:27 +0200 + +xfaces (3.3-12) unstable; urgency=low + + * Walked through the checklist and undated the Standards-Version to 2.4.0.0 + * The xfaces binary is now striped + * Applied Richard Braakman 's fixes to the package + description (Bug #19002) + + -- Hakan Ardo Wed, 11 Mar 1998 18:57:58 +0100 + +xfaces (3.3-11) unstable; urgency=low + + * Man page now compressed + * Leading spaces in description removed + * Now has /var/spool/main as default maildir (Bug #18050) + + -- Hakan Ardo Sat, 21 Feb 1998 19:33:07 +0100 + +xfaces (3.3-10) unstable; urgency=low + + * Recompiled with the fixed version of libcompface to remove libc5 + dependencis (Bug #14803, #16688) + + -- Hakan Ardo Mon, 12 Jan 1998 12:02:05 +0100 + +xfaces (3.3-9) unstable; urgency=low + + * Recompiled with libc6 compatible libs (Bug #12808 and #12937) + + -- Hakan Ardo Tue, 23 Sep 1997 17:47:47 +0200 + +xfaces (3.3-8) unstable; urgency=low + + * Now only depends on xlib6, and not elf-x11r6lib (Bug #11944) + + -- Hakan Ardo Mon, 25 Aug 1997 15:47:40 +0200 + +xfaces (3.3-7) unstable; urgency=low + + * /usr/X11R6/lib/X11/app-defaults/XFaces no longer marked as app-default (fixes bug #11235) + * + + -- Hakan Ardo Wed, 12 Feb 1997 07:49:02 +0100 + +xfaces (3.3-6) unstable; urgency=low + + * Now recomends picons insted of picon (Fixes Bug#7198) + + -- Hakan Ardo Sun, 9 Feb 1997 20:51:13 +0100 + +xfaces (3.3-5) unstable; urgency=low + + * Modified app-default file to find weather picons + * Modified app-default file to find users & domains picon dbs + + -- Hakan Ardo Fri, 24 Jan 1997 19:35:02 +0100 + +xfaces (3.3-4) unstable; urgency=low + + * Now recommends picon + * Changed maintainer EMail to hakan@debian.org + * Modified app-default file to search for faces in /usr/lib/picon + * Modified app-default file to point to the new image directory + * Move images from /usr/images to /usr/X11R6/lib/X11/xfaces/images + This closes Bug#6571 + + -- Hakan Ardo Sat, 18 Jan 1997 18:13:35 +0100 + +xfaces (3.3-3) unstable; urgency=low + + * Renamed /usr/X11R6/man/man1/xfaces.man1 to /usr/X11R6/man/man1/xfaces.1x + + -- Hakan Ardo Sun, 10 Nov 1996 11:19:25 +0200 + +xfaces (3.3-2) unstable; urgency=low + + * Applyed patch-charnier + + -- Hakan Ardo Wed, 6 Nov 1996 17:21:38 +0200 + +xfaces (3.3-1) unstable; urgency=low + + * Initial release. + + -- Hakan Ardo Fri, 27 Sep 1996 19:33:13 +0200 + +Local variables: +mode: debian-changelog +End: --- xfaces-3.3.orig/debian/compat +++ xfaces-3.3/debian/compat @@ -0,0 +1 @@ +9 --- xfaces-3.3.orig/debian/conffiles +++ xfaces-3.3/debian/conffiles @@ -0,0 +1 @@ +/etc/X11/app-defaults/XFaces --- xfaces-3.3.orig/debian/control +++ xfaces-3.3/debian/control @@ -0,0 +1,45 @@ +Source: xfaces +Section: mail +Priority: optional +Maintainer: Hakan Ardo +Standards-Version: 3.9.6 +Build-Depends: libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, xutils-dev, x11proto-core-dev, libxaw7-dev, nas-dev, libcompfaceg1-dev, debhelper (>=9) + +Package: xfaces +Section: mail +Priority: optional +Architecture: any +Suggests: picons +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Displays an image for each piece of mail in your mailbox + XFaces is a program that will display an image for each + piece of mail in your mail box. This lets you know at a + glance who you have mail from. XFaces starts out (when you + have no mail) looking like a color xbiff. As you receive + mail XFaces becomes a column of mail images. Some of XFaces + features: + - Both mono and color images. + - Optional Shaped window support with both xpm and xbm. + - Sound support using the NetAudio protocol. The NetAudio server + currently supports Sun's SparcStation (SunOS 4.1.X and Solaris + 2.2), SGI's Indigo and NCD MCX X terminals running NCDware 3.1 or + later. + - Face images can be "compressed" so that each image will only show + up once on your display. This way, if you receive 30 messages from + one user, list or whatever the image will only show up once. + - You can use regular expressions to search any headers to choose + images and sounds or ignore that mail message completely. This + lets you specify an image/sound for mail that comes from a mailing + list or ignore mail that you have already seen but left in your + system mailbox. + - Compatibility support for Rich Burridge's faces program. This + includes the ability to run user command to generate the image + list. + - Support for POP mailboxes. + - XFaces can kick off shell commands based upon mailbox contents. + You could have yourself paged when a high priority item needs your + attention. + - XFaces can run external filters to convert images into Xpm so that + image formats that XFaces does not understand can be used. + - The annotations for mail items include username, hostname, count, + user@host, the contents of any header. --- xfaces-3.3.orig/debian/copyright +++ xfaces-3.3/debian/copyright @@ -0,0 +1,30 @@ +This is a Debian GNU/Linux prepackaged version of Christopher B. Liebman +xfaces utility. It will display an image for each piece of mail in your +mail box. This lets you know at a glance who you have mail from. + +This package was put together by me, Hakan Ardo + from the sourcecode I obtained from +ftp.cs.indiana.edu:/pub/faces/xfaces/xfaces-3.3.tar.Z. I have +applyed the patches listed in /usr/doc/xfaces/patches. + +------------------------------------------------------------------------------- + + Copyright 1994 Christopher B. Liebman + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name Christopher B. Liebman not + be used in advertising or publicity pertaining to distribution of this + software without specific, written prior permission. + + THIS SOFTWARE IS PROVIDED `AS-IS'. CHRISTOPHER B. LIEBMAN, DISCLAIMS + ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT + LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL CHRISTOPHER + B. LIEBMAN, BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL, + INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR + PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF + WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- xfaces-3.3.orig/debian/patcheslist +++ xfaces-3.3/debian/patcheslist @@ -0,0 +1,87 @@ +-rw-r--r-- 1 kinzler ftp 797 Feb 3 1995 patch-kinzler +|The man page for xfaces 3.3 documents that the -c command line option +|will set the XFaces.frame.maxWidth resource, while in the code, it +|actually sets the XFaces.frame.setWidth resource. This patch will fix +|the code to correspond to the man page, which is, I believe, the more +|desirable behavior. +| +|Steve Kinzler, kinzler@cs.indiana.edu, Feb 95 + +-rw-r--r-- 1 kinzler ftp 2997 Apr 26 1995 patch-kinzler3 +|This patch for xfaces 3.3 will disable checking for ain/dom/user image +|files and only check for ain/dom/user/face files. This will speed up +|the facedb search considerably and is recommended if all your facedb +|databases have image files named "face.*", like the picons databases do. +| +|Be sure to compile xfaces with FACE_FILES_ONLY defined to enable this +|optimization. +| +|Steve Kinzler, kinzler@cs.indiana.edu, Apr 95 + +-rw-r--r-- 1 kinzler ftp 3950 May 2 1995 patch-graaff +|I just noticed you have made some patches for xfaces. I've also made one, +|which addresses the problem with the cached entries. I've inserted some +|code to make proper cache checks, instead of commenting things out, +|but my code is far from elegant. +|-- +|Hans de Graaff J.J.deGraaff@TWI.TUDelft.NL +|Delft University of Technology Department of Information Systems + +-rw-r--r-- 1 kinzler ftp 3887 May 20 1996 patch-amir +|Date: Mon, 20 May 96 19:06:33 IDT +|From: amir@piccard.ddddf.com (Amir J. Katz) +|To: faces@cs.indiana.edu +|Subject: Patches to xfaces.man +| +|I've found some errors & typos in xfaces.man: +|1. In the section describing resource Xfaces.imageTypes: +| Shaped xpm file names is wrong. It says "face-shaped.xpm". Should +| be "face-shape.xpm". +|2. In the section describing the resource Xfaces.commandSearch: +| "resoiurce" --> "resource". +|3. In the section describing resource Xfaces.afterCommandBindings: +| The vertical bar (pipe) is not escaped, so it gets eaten by nroff. +|4. In the section documenting the "XFaces.useCommands" resource. +| +|This patch supersedes my previous post, so if you've applied the +|previous patch, please revert to the original and apply this one. +(Hunk #4 failed at 506.) + +-rw-r--r-- 1 kinzler ftp 1057 Aug 1 1996 patch-faber +|Date: Thu, 01 Aug 96 13:05:50 PDT +|From: Ted Faber +|To: kinzler@cs.indiana.edu, liebman@zod.clark.net +|Subject: Minor xfaces patch +| +|Hi, guys. I'm not sure which of you I should send this to, but I found a +|one line bug, a typo really, in the source to xfaces-3.3 available from +|Steve's archive, and have a 1 line patch that fixes it. +| +|In the code to construct the mailitem list from a command output, the tail +|of the list isn't updated properly, which causes xfaces to dump core when +|the list changes significantly. (Specifically, TheMailItemsTail is NULL +|when TheMailItems isn't, which causes a NULL to be dereferenced.) Here's +|the patch, do what you want with it. +| +|I'm not on the faces mailing list, so my apologies if this has been posted +|before. + +-rw-r--r-- 1 kinzler ftp 1439 Nov 3 20:50 patch-charnier +|Date: Sun, 03 Nov 1996 14:52:02 +0100 +|From: "Philippe Charnier" +|To: faces@cs.indiana.edu +|Subject: bug in xfaces-3.3 +| +|Hello, +| +|According to the README, I sent this to liebman@zod.clark.net, but I got +|(Name server: zod.clark.net: host not found), so here is again: +| +|I found use of a reference that can be unallocated. Please find the +|enclosed patch. + +-rw-r--r-- 1 8000 609 Aug 22 2001 patch-robh +|The following patch should get the XFaces.useContentLength resource +|working properly. +| +|Rob Henderson, robh@cs.indiana.edu, Aug 2001 --- xfaces-3.3.orig/debian/prerm +++ xfaces-3.3/debian/prerm @@ -0,0 +1,9 @@ +#!/bin/sh -e + +PACKAGE="xfaces" + +# FSSTND compatibility symlinks +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \ + -a -L /usr/doc/$PACKAGE ]; then + rm -f /usr/doc/$PACKAGE +fi --- xfaces-3.3.orig/debian/rules +++ xfaces-3.3/debian/rules @@ -0,0 +1,95 @@ +#!/usr/bin/make -f +# Sample debian.rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified + +# There used to be `source' and `diff' targets in this file, and many +# packages also had `changes' and `dist' targets. These functions +# have been taken over by dpkg-source, dpkg-genchanges and +# dpkg-buildpackage in a package-independent way, and so these targets +# are obsolete. + +package=xfaces + +build: + $(checkdir) + touch build + +build-arch: build +build-indep: build + +clean: + $(checkdir) + -rm -f build + $(MAKE) clean + -rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars + dh_clean + +binary-indep: checkroot build + $(checkdir) +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: checkroot build + $(checkdir) + -rm -rf debian/tmp + install -d debian/tmp debian/tmp/DEBIAN + install -d debian/tmp/usr/doc/$(package) + install -d debian/tmp/usr/bin + install -d debian/tmp/usr/share/man/man1 + install -d debian/tmp/etc/X11/app-defaults + install -d debian/tmp/usr/share/xfaces/images + xmkmf + sed -i -e 's/ CFLAGS = /override CFLAGS += /' Makefile + sed -i -e 's/ LDOPTIONS = / LDOPTIONS = $$(LDFLAGS) /' Makefile + $(MAKE) $(shell dpkg-buildflags --export=cmdline) all + cp xfaces debian/tmp/usr/bin/xfaces + strip debian/tmp/usr/bin/xfaces + install -m0644 XFaces.ad debian/tmp/etc/X11/app-defaults/XFaces + install -m0644 xfaces.man debian/tmp/usr/share/man/man1/xfaces.1x + gzip -9vn debian/tmp/usr/share/man/man1/xfaces.1x + cp debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian + cp debian/patcheslist debian/tmp/usr/doc/$(package)/. + cp images/* debian/tmp/usr/share/xfaces/images + chmod 0644 debian/tmp/usr/share/xfaces/images/* + if [ -f debian/conffiles ]; then \ + cp debian/conffiles debian/tmp/DEBIAN; \ + else \ + touch debian/tmp/DEBIAN/conffiles; \ + fi + cp README TODO CHANGES CREDITS debian/tmp/usr/doc/$(package)/ + cp ChangeLog debian/tmp/usr/doc/$(package)/changelog + gzip -9vn debian/tmp/usr/doc/$(package)/* + cp debian/copyright debian/tmp/usr/doc/$(package)/. + chmod 0644 debian/tmp/usr/doc/$(package)/* + dpkg-shlibdeps xfaces + dpkg-gencontrol -isp + chown -R root.root debian/tmp + chmod -R g-ws debian/tmp + mv debian/tmp/usr/doc debian/tmp/usr/share + cp debian/prerm debian/tmp/DEBIAN + chmod 755 debian/tmp/DEBIAN/prerm + dh_strip + dpkg --build debian/tmp .. + +define checkdir + test -f face_actions.c -a -f debian/rules +endef + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot --- xfaces-3.3.orig/debian/rules.org +++ xfaces-3.3/debian/rules.org @@ -0,0 +1,86 @@ +#!/usr/bin/make -f +# Sample debian.rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified + +# There used to be `source' and `diff' targets in this file, and many +# packages also had `changes' and `dist' targets. These functions +# have been taken over by dpkg-source, dpkg-genchanges and +# dpkg-buildpackage in a package-independent way, and so these targets +# are obsolete. + +package=xfaces + +build: + $(checkdir) + touch build + +clean: + $(checkdir) + -rm -f build + -$(MAKE) -i clean + -rm -rf *~ debian/tmp debian/*~ debian/files* + +binary-indep: checkroot build + $(checkdir) +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: checkroot build + $(checkdir) + -rm -rf debian/tmp + install -d debian/tmp debian/tmp/DEBIAN + install -d debian/tmp/usr/doc/$(package) + install -d debian/tmp/usr/X11R6/bin + install -d debian/tmp/usr/X11R6/man/man1 + install -d debian/tmp/usr/X11R6/lib/X11/app-defaults + install -d debian/tmp/usr/X11R6/lib/X11/xfaces/images + xmkmf + $(MAKE) all + cp xfaces debian/tmp/usr/X11R6/bin/xfaces + strip debian/tmp/usr/X11R6/bin/xfaces + cp XFaces.ad debian/tmp/usr/X11R6/lib/X11/app-defaults/XFaces + cp xfaces.man debian/tmp/usr/X11R6/man/man1/xfaces.1x + gzip -9v debian/tmp/usr/X11R6/man/man1/xfaces.1x + cp debian/changelog debian/tmp/usr/doc/$(package)/changelog.Debian + cp debian/patches debian/tmp/usr/doc/$(package)/. + cp images/* debian/tmp/usr/X11R6/lib/X11/xfaces/images + if [ -f debian/conffiles ]; then \ + cp debian/conffiles debian/tmp/DEBIAN; \ + else \ + touch debian/tmp/DEBIAN/conffiles; \ + fi + cp debian/postinst debian/prerm debian/tmp/DEBIAN + cp README TODO CHANGES CREDITS debian/tmp/usr/doc/$(package)/ + cp ChangeLog debian/tmp/usr/doc/$(package)/changelog + gzip -9v debian/tmp/usr/doc/$(package)/* + cp debian/copyright debian/tmp/usr/doc/$(package)/. + dpkg-shlibdeps xfaces + dpkg-gencontrol + chown -R root.root debian/tmp + chmod -R g-ws debian/tmp + mkdir debian/tmp/usr/share + mv debian/tmp/usr/doc debian/tmp/usr/share + dpkg --build debian/tmp .. + +define checkdir + test -f face_actions.c -a -f debian/rules +endef + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot --- xfaces-3.3.orig/face_binding.c +++ xfaces-3.3/face_binding.c @@ -57,6 +57,7 @@ #endif #include "faces.h" +#include /* --- xfaces-3.3.orig/face_command.c +++ xfaces-3.3/face_command.c @@ -43,6 +43,7 @@ #include "faces.h" #include "face_command.h" #include "face_search.h" +#include static FaceCommand* TheCommands; --- xfaces-3.3.orig/face_image.c +++ xfaces-3.3/face_image.c @@ -204,15 +204,22 @@ int length; static char* filename = NULL; static int filename_length = 0; - + + char my_label[512]; /* * First see if we already have this image. */ + for (fi = TheImages; fi != NULL; fi = fi->next) { if (strcmp(fi->file, file) == 0) { + if (info && info->item) { + sprintf(my_label, "%s@%s", info->item->user, info->item->host); + if (strcmp(fi->label, my_label)) + break; + } /* * Yep! */ @@ -290,7 +297,6 @@ /* * Ok, create a face image struct. */ - fi = FaceImageCreate(file, info->type, image_data); info->item->image = fi; @@ -367,6 +373,11 @@ break; } } + +#ifdef FACEDB_DEBUG + if (found) + fprintf(stderr, "FaceImageLoad: Reporting %s as found\n", file); +#endif return found; } --- xfaces-3.3.orig/face_image_xface.c +++ xfaces-3.3/face_image_xface.c @@ -40,6 +40,7 @@ static char *RCSid = "$Id: face_image_xface.c,v 1.3 1994/02/23 13:17:02 liebman Exp $"; #endif +#include #include "faces.h" #include "face_image.h" --- xfaces-3.3.orig/face_image_xpm.c +++ xfaces-3.3/face_image_xpm.c @@ -476,7 +476,7 @@ static FaceImageType FaceImageTypeXpm = { "xpm", - FaceImageXpmRead, + FaceImageShapedXpmRead, FaceImageXpmFree, FaceImageXpmPixmap, FaceImageXpmShape, --- xfaces-3.3.orig/face_search_facedb.c +++ xfaces-3.3/face_search_facedb.c @@ -483,6 +483,10 @@ int parts; char* username; FacedbMap* map; + +#ifdef FACEDB_DEBUG + fprintf(stderr, "facedb: searching in path %s\n", path); +#endif if (buffer1 == NULL) { @@ -535,7 +539,7 @@ */ FaceSearchFacedbMakeName(file, info, i, buffer1); - +#ifndef FACE_FILES_ONLY /* * Try to load this guy. */ @@ -550,7 +554,7 @@ XtFree(hostdata); return 1; } - +#endif /* * try adding "/face" and see what we find. */ @@ -570,29 +574,12 @@ return 1; } -#if 0 - /* - * Finally if we are looking for an image try "/48x48x1". - */ - - if (info->data->format == FormatImage) - { - strcpy(tail, "/48x48x1"); - - if (FaceSearchLoad(buffer1, info->item, info->data)) - { - XtFree((char*) host); - XtFree(hostdata); - return 1; - } - } -#endif } /* * try for user in the MISC directory. */ - +#ifndef FACE_FILES_ONLY sprintf(buffer1, "%sMISC/%s", file, username); #ifdef FACEDB_DEBUG @@ -605,7 +592,7 @@ XtFree(hostdata); return 1; } - +#endif sprintf(buffer1, "%sMISC/%s/face", file, username); #ifdef FACEDB_DEBUG @@ -632,7 +619,7 @@ */ FaceSearchFacedbMakeName(file, info, i, buffer1); - +#ifndef FACE_FILES_ONLY /* * Try to load this guy. */ @@ -653,7 +640,7 @@ return 1; } - +#endif /* * try adding "/face" and see what we find. */ @@ -679,23 +666,6 @@ return 1; } -#if 0 - /* - * Finally if we are looking for an image try "/48x48x1". - */ - - if (info->data->format == FormatImage) - { - strcpy(tail, "/48x48x1"); - - if (FaceSearchLoad(buffer1, info->item, info->data)) - { - XtFree((char*) host); - XtFree(hostdata); - return 1; - } - } -#endif } XtFree((char*) host); @@ -704,7 +674,7 @@ /* * One last try. The MISC directory. Look for "unknown" */ - +#ifndef FACE_FILES_ONLY sprintf(buffer1, "%sMISC/unknown", file); #ifdef FACEDB_DEBUG @@ -721,7 +691,7 @@ return 1; } - +#endif sprintf(buffer1, "%sMISC/unknown/face", file); #ifdef FACEDB_DEBUG --- xfaces-3.3.orig/faces.h +++ xfaces-3.3/faces.h @@ -181,6 +181,7 @@ int pop_port; String pop_auth_file; /* login/passwd for pop server */ /* (full path!) */ + Boolean pop_use_top; /* whether to use TOP or RETR */ String image_path; /* Where to find the images. */ char* image_path_str; char** image_paths; --- xfaces-3.3.orig/mail_box.c +++ xfaces-3.3/mail_box.c @@ -33,6 +33,8 @@ * Routines to parse the mail file. */ +#include + #ifndef lint static char *RCSid = "$Id: mail_box.c,v 1.2 1994/02/23 13:17:02 liebman Exp $"; #endif @@ -138,7 +140,8 @@ * We got a list of headers so skip the body. */ - MailBodySkip(content_length); + /*MailBodySkip(content_length);*/ + MailBodySkip(content_length == -1 ? -1 : content_length+1); /* * If we used the content_length value then we should skip --- xfaces-3.3.orig/mail_items.c +++ xfaces-3.3/mail_items.c @@ -351,9 +351,18 @@ MailBoxClean() { MailItem *item; - - for (item = TheMailItems; item != NULL; item = item->next) + MailItem *next_item; + + for (item = TheMailItems; item != NULL; item = next_item) { + /* + * Save item->next here because if MailItemFree() is called, it will + * free item and we won't be able to access it after the call. + * Found by phkmalloc. Philippe Charnier (charnier@xp11.frmug.org) + * 11/96. + */ + next_item = item->next; + if (item->in_use == 0) { MailItemFree(item); @@ -651,6 +660,7 @@ { item->prev = TheMailItemsTail; item->prev->next = item; + TheMailItemsTail = item; } item->face = FaceDisplay(item); --- xfaces-3.3.orig/main.c +++ xfaces-3.3/main.c @@ -72,6 +72,7 @@ #ifdef __STDC__ #include #endif +#include /* * The resources. @@ -124,7 +125,7 @@ }, { "spoolDir", "SpoolDir", XtRString, sizeof(String), - offset(spool_dir), XtRString, "/usr/spool/mail" + offset(spool_dir), XtRString, "/var/spool/mail" }, { "popHost", "PopHost", XtRString, sizeof(String), @@ -139,6 +140,10 @@ offset(pop_port), XtRString, "110" }, { + "popTop", "popTop", XtRBoolean, sizeof(Boolean), + offset(pop_use_top), XtRBoolean, (caddr_t) &defTrue + }, + { "listCommand", "Command", XtRString, sizeof(String), offset(list_command), XtRString, NULL }, @@ -328,6 +333,9 @@ }, { "-pop", "popHost", XrmoptionSepArg, NULL + }, + { + "-popretr", "popTop", XrmoptionNoArg, "False" } }; --- xfaces-3.3.orig/patch +++ xfaces-3.3/patch @@ -0,0 +1,98 @@ +diff -ur xfaces-3.3.orig/debian/control xfaces-3.3/debian/control +--- xfaces-3.3.orig/debian/control 2003-08-10 23:38:51.000000000 +1200 ++++ xfaces-3.3/debian/control 2004-07-26 12:38:35.000000000 +1200 +@@ -3,7 +3,7 @@ + Priority: optional + Maintainer: Hakan Ardo + Standards-Version: 3.1.1.0 +-Build-Depends: xlibs-dev, libxaw7-dev, nas-dev, libcompfaceg1-dev, xutils, debhelper ++Build-Depends: xlibs-dev, libxaw7-dev, nas-dev, libcompfaceg1-dev, xutils, debhelper, rman + + Package: xfaces + Section: mail +Only in xfaces-3.3/debian: files +Only in xfaces-3.3/debian: substvars +Only in xfaces-3.3/debian: tmp +diff -ur xfaces-3.3.orig/faces.h xfaces-3.3/faces.h +--- xfaces-3.3.orig/faces.h 1997-01-19 06:10:25.000000000 +1300 ++++ xfaces-3.3/faces.h 2004-07-26 15:26:58.000000000 +1200 +@@ -181,6 +181,7 @@ + int pop_port; + String pop_auth_file; /* login/passwd for pop server */ + /* (full path!) */ ++ Boolean pop_use_top; /* whether to use TOP or RETR */ + String image_path; /* Where to find the images. */ + char* image_path_str; + char** image_paths; +diff -ur xfaces-3.3.orig/main.c xfaces-3.3/main.c +--- xfaces-3.3.orig/main.c 1998-02-22 07:32:06.000000000 +1300 ++++ xfaces-3.3/main.c 2004-07-26 15:25:19.000000000 +1200 +@@ -139,6 +139,10 @@ + offset(pop_port), XtRString, "110" + }, + { ++ "popTop", "popTop", XtRBoolean, sizeof(Boolean), ++ offset(pop_use_top), XtRBoolean, (caddr_t) &defTrue ++ }, ++ { + "listCommand", "Command", XtRString, sizeof(String), + offset(list_command), XtRString, NULL + }, +@@ -328,6 +332,9 @@ + }, + { + "-pop", "popHost", XrmoptionSepArg, NULL ++ }, ++ { ++ "-popretr", "popTop", XrmoptionNoArg, "False" + } + }; + +diff -ur xfaces-3.3.orig/pop_check.c xfaces-3.3/pop_check.c +--- xfaces-3.3.orig/pop_check.c 1997-01-19 06:10:27.000000000 +1300 ++++ xfaces-3.3/pop_check.c 2004-07-26 15:27:36.000000000 +1200 +@@ -362,7 +362,14 @@ + fprintf(stderr, "PopRetr(%d)\n", item); + #endif + +- fprintf(output, "RETR %d\r\n", item); ++ if (TheFacesResources.pop_use_top) ++ { ++ fprintf(output, "TOP %d 0\r\n", item); ++ } ++ else ++ { ++ fprintf(output, "RETR %d\r\n", item); ++ } + + if (!PopResponce()) + { +diff -ur xfaces-3.3.orig/xfaces.man xfaces-3.3/xfaces.man +--- xfaces-3.3.orig/xfaces.man 1997-01-19 06:10:27.000000000 +1300 ++++ xfaces-3.3/xfaces.man 2004-07-26 15:37:42.000000000 +1200 +@@ -75,6 +75,10 @@ + .BI \-pop " " + This option specifies the host name to use for a POP3 mailbox. Also + available as \fBXFaces.popHost\fP. ++.TP 8 ++.BI \-top ++For backwards compatibility, use the RETR POP3 command instead of TOP ++to check for new messages on the POP3 server. + .SH X DEFAULTS + The application class name is \fBXFaces\fP. For best results the + following \fBShell\fP resource is suggested: +@@ -188,6 +192,12 @@ + This specifies what \fIport number\fP to use for POP. The default is + the standard POP3 port 110. + .TP 8 ++.BI XFaces.popTop: " " ++Specify whether or not to use the newer TOP POP3 command, rather than ++the RETR command (which may have the side-effect of marking the mail ++read on the POP3 server). This also reduces the amount of network traffic ++to the POP3 server, so is enabled by default. ++.TP 8 + .BI XFaces.listCommand: + This resource specifies a user command that will be executed instead + of looking at the spool file. If this resource is specified then + + --- xfaces-3.3.orig/path.c +++ xfaces-3.3/path.c @@ -42,6 +42,7 @@ #include "faces.h" #include +#include char** PathParse(str) --- xfaces-3.3.orig/pop_check.c +++ xfaces-3.3/pop_check.c @@ -45,6 +45,8 @@ #include #include #include +#include +#include FILE* input = NULL; FILE* output = NULL; @@ -362,7 +364,14 @@ fprintf(stderr, "PopRetr(%d)\n", item); #endif - fprintf(output, "RETR %d\r\n", item); + if (TheFacesResources.pop_use_top) + { + fprintf(output, "TOP %d 0\r\n", item); + } + else + { + fprintf(output, "RETR %d\r\n", item); + } if (!PopResponce()) { --- xfaces-3.3.orig/regexp.c +++ xfaces-3.3/regexp.c @@ -23,6 +23,8 @@ * regular-expression syntax might require a total rethink. */ #include +#include + #include "regexp.h" #include "regmagic.h" --- xfaces-3.3.orig/xfaces.man +++ xfaces-3.3/xfaces.man @@ -1,4 +1,4 @@ -.TH XFACES 1 +.TH XFACES 1x .SH NAME xfaces - mail image display for X .SH SYNOPSIS @@ -75,6 +75,10 @@ .BI \-pop " " This option specifies the host name to use for a POP3 mailbox. Also available as \fBXFaces.popHost\fP. +.TP 8 +.BI \-top +For backwards compatibility, use the RETR POP3 command instead of TOP +to check for new messages on the POP3 server. .SH X DEFAULTS The application class name is \fBXFaces\fP. For best results the following \fBShell\fP resource is suggested: @@ -188,6 +192,12 @@ This specifies what \fIport number\fP to use for POP. The default is the standard POP3 port 110. .TP 8 +.BI XFaces.popTop: " " +Specify whether or not to use the newer TOP POP3 command, rather than +the RETR command (which may have the side-effect of marking the mail +read on the POP3 server). This also reduces the amount of network traffic +to the POP3 server, so is enabled by default. +.TP 8 .BI XFaces.listCommand: This resource specifies a user command that will be executed instead of looking at the spool file. If this resource is specified then @@ -289,7 +299,7 @@ no image. This defaults to \fITrue\fP. .TP 8 .BI XFaces.useCommands: " " -This resource tells \FIXFaces\fP if it needs to search for shell commands to +This resource tells \fIXFaces\fP if it needs to search for shell commands to run in addition to image and sounds. The default is \fIFalse\fP. .TP 8 .BI XFaces.useContentLength: " " @@ -318,7 +328,7 @@ .TP 8 .B xpm-shaped This is a shaped color image. Shaped xpm files should be named -\fIface-shaped.xpm\fP. +\fIface-shape.xpm\fP. .TP 8 .B xpm This is a non shaped color image. These files should be named @@ -357,7 +367,7 @@ The \fI\fP is currently ignored for the \fBsoundSearch\fP resource. Both the \fI\fP and the are (except if you use the \fIfacedb\fP search) for the \fBcommandSearch\fP -resoiurce. If the \fI\fP is empty then the list in the +resource. If the \fI\fP is empty then the list in the \fBimageFormats\fP resource is used. If the \fI\fP is empty then the \fBfacedbPath\fP is used for \fIfacedb\fP searches for both sounds and images and one of the \fBsoundPath\fP or