Re: wchar_t conflicting types on RHL 6.0?

[Christian Jönsson FOA 72 <chj at lin dot foa dot se>]

Too quick to hit that send button..., here are the attached spec and patch 
files.

Cheers,

/ChJ
Summary: PostScript pretty printers and Motif based GUI.
Name: mpdist
Version: 3.4.0
Release: 1
Source: http://java.sun.com/people/richb/RichApps/mp/mp.tar.Z
Patch: mpdist.linux.patch
Copyright: GPL, sort of...
Group: Utilities/Printing
URL: http://java.sun.com/people/richb
Buildroot: /tmp/mpdist

%changelog

* Sat Sep 4 1999 Christian Joensson <chj@lin.foa.se>
  [mpdist-3.4.0-1]
  - Update to use mpdist release 3.4.0.

* Tue Aug 10 1999 Christian Joensson <chj@lin.foa.se>
  [mpdist-3.3.5-3]
  - Recompile under Red Hat Linux 6.0 and use lesstif.

* Fri Jul 17 1998 Christian Joensson <chj@lin.foa.se>
  [mpdist-3.3.5-2]
  - Correct missing /usr/lib/mp dir hier and symbolic links.

* Fri Jul 17 1998 Christian Joensson <chj@lin.foa.se>
  [mpdist-3.3.5-1]
  - Create.

%description
The mp distribution now consists of two programs, mp and mptool.

The mp program will pretty print various files for you. It can be used
in conjunction with a mail reading utility for producing a pretty print
of your mail items. It can be used with a news reading tool to pretty
print news articles. Digests can also be printed, and this version can
pretty print ordinary ASCII files as well. Support for personal organiser
printing was added into the last released version. There are numerous 
configuration options to allow you to adjust the way mp generates it's
output.

The mptool program is a graphical frontend to mp. It makes it easy to
configure the printout of your documents without having to remember lots
of complicated command line arguments. It also supports drag and drop of
text from other Motif applications.

%prep
%setup -n mpdist
%patch -p1

rm -rf		$RPM_BUILD_ROOT
mkdir -p	$RPM_BUILD_ROOT/usr/bin
mkdir -p	$RPM_BUILD_ROOT/usr/man/man1
mkdir -p	$RPM_BUILD_ROOT/usr/lib

%build

make -f Makefile.static.libXm all


%install
make MPPATH=$RPM_BUILD_ROOT/usr install -f Makefile.static.libXm
strip $RPM_BUILD_ROOT/usr/bin/mp $RPM_BUILD_ROOT/usr/bin/mptool

%clean
if [ "X$RPM_BUILD_ROOT" != "X" ]; then
   rm -rf $RPM_BUILD_ROOT
fi


%files
%attr(-,root,root) %doc CHANGES FILES README TODO mp.el mp.tcsh
%attr(-,root,root) /usr/bin/mp*
%attr(-,root,root) /usr/bin/mimep
%attr(-,root,root) /usr/bin/mimepurl
%attr(-,root,root) /usr/bin/text2latex
%attr(-,root,root) /usr/bin/cutlines
%attr(-,root,root) /usr/bin/ertf2latex
%attr(-,root,root) /usr/bin/iseps
%attr(-,root,root) /usr/bin/printmim
%attr(-,root,root) /usr/bin/mimepfilo
%attr(-,root,root) /usr/bin/mailp
%attr(-,root,root) /usr/bin/newsp
%attr(-,root,root) /usr/bin/digestp
%attr(-,root,root) /usr/bin/filep
%attr(-,root,root) /usr/bin/filofaxp
%attr(-,root,root) /usr/bin/fileofaxpp
%attr(-,root,root) /usr/bin/franklinp
%attr(-,root,root) /usr/bin/proplanp
%attr(-,root,root) /usr/bin/timemanp
%attr(-,root,root) /usr/bin/timesysip
%attr(-,root,root) /usr/bin/timesyspp
%attr(-,root,root) /usr/man/man1/*
%attr(-,root,root) /usr/lib/mp/*
diff -cNr mpdist/Makefile.static.libXm mpdist.linux/Makefile.static.libXm
*** mpdist/Makefile.static.libXm	Thu Jan  1 01:00:00 1970
--- mpdist.linux/Makefile.static.libXm	Sat Sep  4 14:14:48 1999
***************
*** 0 ****
--- 1,271 ----
+ #
+ #  Makefile for mp, the PostScript pretty printer.
+ #
+ #  @(#)Makefile.dist 1.23 97/10/02
+ #
+ #  Copyright (c) Steve Holden and Rich Burridge.
+ #                All rights reserved.
+ #
+ #  Permission is given to distribute these sources, as long as the
+ #  copyright messages are not removed, and no monies are exchanged.
+ #
+ #  No responsibility is taken for any errors inherent either
+ #  to the comments or the code of this program, but if reported
+ #  to me then an attempt will be made to fix them.
+ #
+ #=====================================================================
+ #  If files are printed with 'lpr' define BSD_PRINT (default). If 'lp'
+ #  is used comment the following definition out. The latter in the default.
+ #
+ #  Examples: SunOS 4.x.x uses 'lpr', HP-UX-9.x uses 'lp';
+ #            some systems might use both:
+ #            IRIX-5.x, AIX-3.2.x, SunOS 5.x (=Solaris 2.x)
+ #
+ BSD_PRINT = -DBSD_PRINT
+ #---------------------------------------------------------------------
+ #  In order to get mptool to link successfully on your system, you might
+ #  need to define extra libraries to link against. If this is the case,
+ #  then the following entry should be uncommented and set appropriately.
+ #
+ #  For Solaris 1.x (SunOS 4.1.x), this option needs to be set to:
+ #  EXTRALIBS = -lXext
+ #
+ #  For Solaris 2.x, this option needed to be set to:
+ #  EXTRALIBS = -lsocket -lnsl -lgen
+ #
+ #  For IRIX 4.0.x on an SGI machine, this option needs to be set to:
+ #  EXTRALIBS = -lPW
+ #
+ #  For OSF/1 on a DEC Alpha machine, this option needs to be set to:
+ #  EXTRALIBS = -ldnet_stub
+ #
+ EXTRALIBS       = -lXp
+ #---------------------------------------------------------------------
+ #  Mp will extract the user's gecos field, and try to make sense of what
+ #  it finds. It applies various rules to do this. If this field is too long,
+ #  then it needs to truncate sensibly. If it's extracted N "words" or has
+ #  found a comma, then it stops extracting. If an ampersand is found, this
+ #  is expanded to the users name in capitals.
+ #  This option allows you to change the number of "words" that mp extracts
+ #  from the gecos field. By default this is 3. If needed, then it should
+ #  be uncommented, and set accordingly.
+ #
+ #GECOSFIELDS     = -DGECOSFIELDS=3
+ #---------------------------------------------------------------------
+ #  Mp will extract upto a certain number of characters from the user's
+ #  passwd gecos field. By default, this is 40. This option allows you to
+ #  set this to something different. If needed, then it should be uncommented,
+ #  and set accordingly.
+ #
+ #GECOSLENGTH     = -DGECOSLENGTH=40
+ #---------------------------------------------------------------------
+ #  Alternate names for the mailp frontend
+ #  If you don't want all these installed, then you should removed the
+ #  unwanted ones. Note that if you don't want any installed, then just
+ #  set:
+ #          MAILPNAMES      =
+ #
+ MAILPNAMES = mailp newsp digestp filep filofaxp fileofaxpp franklinp \
+ 	     proplanp timemanp timesysip timesyspp
+ #---------------------------------------------------------------------
+ #  Mimep is capable of MIME support (by using LaTeX and metamail). It uses
+ #  some functions from the mp distrubution. To enable these functions then
+ #  uncomment the following definition.
+ #
+ MIME_SUPPORT    = -DMIME_SUPPORT
+ #---------------------------------------------------------------------
+ #  Mptool uses Motif. If you are compiling mptool you will need to
+ #  uncomment the following two lines and set appropriately.
+ #
+ MOTIFINCDIR     = -I/usr/X11R6/include
+ MOTIFLIBDIR     = -L/usr/X11R6/lib
+ #---------------------------------------------------------------------
+ #  Some systems have memory move functions not in <string.h> (ANSI C)
+ #  but in <memory.h> e.g. SunOS-4.x.
+ #  In this case uncomment the following definition.
+ #
+ #  Convex systems don't have this header file
+ #
+ #NEED_MEMORY = -DNEED_MEMORY
+ #---------------------------------------------------------------------
+ #  If you want to compile mptool and you are using a version of Motif
+ #  earlier than 1.2, than you need to uncomment this definition. Mptool
+ #  won't support drag and drop but the rest of the functionality should
+ #  be there.
+ # 
+ #NO_DND         = -DNO_DND
+ #---------------------------------------------------------------------
+ #  Some printers (ie. some models of HP LaserJet's) cannot handle duplex
+ #  printing. To disable this feature, uncomment the following definition.
+ #
+ #NO_DUPLEX      = -DNO_DUPLEX
+ #---------------------------------------------------------------------
+ #  Mptool tries to internationalise text. This requires a #include file
+ #  called <nl_types.h>. This might not be present on all systems. If you
+ #  don't want internationalised text, then uncomment the following
+ #  definition.
+ #
+ #NO_I18N        = -DNO_I18N
+ #---------------------------------------------------------------------
+ #  The previous version of mp had different (mainly single character)
+ #  command line options. If You'd like this version of mp/mptool to
+ #  also support those options, then the following definition needs to be
+ #  uncommented.
+ #
+ #OLD_OPTIONS    = -DOLD_OPTIONS
+ #---------------------------------------------------------------------
+ #  It is possible to change the location of the mp prologue file
+ #  with the -p command line option. It can also be defined at compile
+ #  time, by uncommenting the macro definition below and setting
+ #  appropriately. If it's not present, then a sensible default value
+ #  is used.
+ #
+ PROLOGUE = -DPROLOGUE=\"$(MPLIBDIR)\"
+ #---------------------------------------------------------------------
+ #  Mp and Mptool need X11 to compile and link properly. You will need to
+ #  set the following two lines appropriately.
+ #
+ X11INCDIR       = -I/usr/X11R6/include
+ X11LIBDIR       = -L/usr/X11R6/lib
+ #=====================================================================
+ #
+ #  Default locations where mp files will be installed.
+ #  You might wish to alter these values.
+ #
+ MPPATH      = /usr
+ MPBINDIR    = $(MPPATH)/bin
+ MPLIBDIR    = $(MPPATH)/lib/mp
+ MPMANDIR    = $(MPPATH)/man/man$(MPMANSECT)
+ MPMANSECT   = l
+ #---------------------------------------------------------------------
+ #  Compilation flags and standard macro definitions.
+ #
+ CCOMP	 = -O2
+ CC       = gcc
+ #---------------------------------------------------------------------
+ #  Compilation flags used by all MP programs.
+ #
+ GENCDEFS   = $(BSD_PRINT) $(GECOSFIELDS) $(GECOSLENGTH) $(MIME_SUPPORT) \
+ 	     $(NEED_MEMORY) $(NO_DUPLEX) $(OLD_OPTIONS) $(PROLOGUE) \
+ 	     $(X11INCDIR)
+ #---------------------------------------------------------------------
+ #  Mp
+ #
+ MPCDEFS   = $(GENCDEFS) -I../common
+ MPCFLAGS  = $(CCOMP) $(MPCDEFS)
+ MPLDFLAGS = $(X11LIBDIR)
+ MPLIBS    = -lX11
+ #
+ #  Options for mp submake.
+ #
+ MPMAKEOPTS = $(MFLAGS) CC=$(CC) CFLAGS='$(MPCFLAGS)' \
+ 		LDFLAGS='$(MPLDFLAGS)' LIBS='$(MPLIBS)' \
+ 		MPBINDIR='$(MPBINDIR)' MPLIBDIR='$(MPLIBDIR)' \
+ 		MPMANDIR='$(MPMANDIR)' MPMANSECT='$(MPMANSECT)' \
+ 		MAILPNAMES='$(MAILPNAMES)'
+ #---------------------------------------------------------------------
+ #  Mptool
+ #
+ MPTOOLCDEFS   = $(GENCDEFS) $(MOTIFINCDIR) $(NO_DND) $(NO_I18N) -I../common
+ MPTOOLCFLAGS  = $(CCOMP) $(MPTOOLCDEFS)
+ MPTOOLLDFLAGS = $(X11LIBDIR) $(MOTIFLIBDIR)
+ MPTOOLLIBS    = -lXm -lXt -lXmu -lX11 $(EXTRALIBS) /usr/X11R6/lib/libXm.a
+ #
+ #  Options for mptool submake.
+ #
+ MPTOOLMAKEOPTS = $(MFLAGS) CC=$(CC) CFLAGS='$(MPTOOLCFLAGS)' \
+ 		LDFLAGS='$(MPTOOLLDFLAGS)' LIBS='$(MPTOOLLIBS)' \
+ 		MPBINDIR='$(MPBINDIR)' MPLIBDIR='$(MPLIBDIR)' \
+ 		MPMANDIR='$(MPMANDIR)' MPMANSECT='$(MPMANSECT)'
+ #---------------------------------------------------------------------
+ #  Mimep
+ #
+ MPSRC         = ../../mp
+ OPTSRC        = ../../common
+ MIMEPCDEFS    = $(GENCDEFS) -I$(OPTSRC) -I$(MPSRC)
+ MIMEPCFLAGS   = $(CCOMP) $(MIMEPCDEFS)
+ MIMEPLIBS     = $(EXTRALIBS) -lX11
+ #
+ #  Options for mimep submake.
+ #
+ MIMEPMAKEOPTS = $(MFLAGS) CC=$(CC) CFLAGS='$(MIMEPCFLAGS)' \
+ 		LIBS='$(MIMEPLIBS)' MIMEPBINDIR='$(MPBINDIR)' \
+ 		MIMEPMANDIR='$(MPMANDIR)' MIMEPMANSECT='$(MPMANSECT)'
+ #=================================================================
+ 
+ .KEEP_STATE:
+ 
+ BINARIES  = mp mptool mimep
+ MPDIR     = mp
+ MPTOOLDIR = mptool
+ MIMEPDIR  = mimep
+ OTHERS	  = README Makefile.dist MANIFEST FILES CHANGES TODO \
+ 	    mp.el mp.tcsh Data
+ 
+ help:
+ 	@echo
+ 	@echo "The Mp distribution now has three parts:"
+ 	@echo
+ 	@echo " mp     - PostScript pretty printer (requires X11)."
+ 	@echo " mptool - graphical frontend to mp (also requires Motif)."
+ 	@echo " mimep  - Multimedia Internet MEssage Printer."
+ 	@echo
+ 	@echo "You need to specify one of the following four options:"
+ 	@echo
+ 	@echo " make mp         - to just make the mp program."
+ 	@echo " make mptool     - to just make the mptool program."
+ 	@echo " make mimep      - to just make the mimep program."
+ 	@echo " make all        - to make all the programs."
+ 	@echo
+ 	@echo "This should be followed by:"
+ 	@echo
+ 	@echo " make install    - you might have to be super-user to do this."
+ 	@echo
+ 
+ all:	$(BINARIES)
+ 
+ mptool::
+ 	(cd $(MPTOOLDIR); $(MAKE) $(MPTOOLMAKEOPTS))
+ 
+ mp::
+ 	(cd $(MPDIR); $(MAKE) $(MPMAKEOPTS))
+ 
+ mimep::
+ 	(cd $(MIMEPDIR); $(MAKE) $(MIMEPMAKEOPTS))
+ 
+ SHELL = /bin/sh
+ 
+ install:
+ 	(cd $(MPTOOLDIR); $(MAKE) $(MPTOOLMAKEOPTS) install)
+ 	(cd $(MPDIR);     $(MAKE) $(MPMAKEOPTS)     install)
+ 	(cd $(MIMEPDIR);  $(MAKE) $(MIMEPMAKEOPTS)  install)
+ 
+ lint:
+ 	(cd $(MPTOOLDIR); $(MAKE) lint)
+ 	(cd $(MPDIR);     $(MAKE) lint)
+ 	(cd $(MIMEPDIR);  $(MAKE) lint)
+ 
+ clean:
+ 	rm -rf *.Z *.uu core
+ 	(cd $(MPTOOLDIR); $(MAKE) $(MPTOOLMAKEOPTS) clean)
+ 	(cd $(MPDIR);     $(MAKE) $(MPMAKEOPTS)     clean)
+ 	(cd $(MIMEPDIR);  $(MAKE) $(MIMEPMAKEOPTS)  clean)
+ 
+ create:    SCCS
+ 	-sccs create $(OTHERS)
+ 	(cd $(MPTOOLDIR); $(MAKE) $(MPTOOLMAKEOPTS) create)
+ 	(cd $(MPDIR);     $(MAKE) $(MPMAKEOPTS)     create) 
+ 	(cd $(MIMEPDIR);  $(MAKE) $(MIMEPMAKEOPTS)  create)
+ 
+ SCCS:
+ 	mkdir SCCS
+ 	chmod 755 SCCS
+ 
+ mimepinstall:
+ 	(cd $(MIMEPDIR); $(MAKE) install)
+   
+ mimepuninstall:
+ 	(cd $(MIMEPDIR); $(MAKE) uninstall)
+   
+ mimepclean:
+ 	(cd $(MIMEPDIR); $(MAKE) clean)