Index: xc/config/cf/xprint_site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Attic/xprint_site.def,v
retrieving revision 1.1.2.4
diff -u -2 -0 -r1.1.2.4 xprint_site.def
--- a/xc/config/cf/xprint_site.def	14 Apr 2004 00:21:39 -0000	1.1.2.4
+++ b/xc/config/cf/xprint_site.def	15 Apr 2004 00:05:14 -0000
@@ -106,40 +106,41 @@
 #define BuildStippleCode NO
 
 /* Temporary for Xorg tree */
 #define BuildFontconfigLibrary         NO
 #define XorgServer                     NO
 #define XF86Server                     NO
 #define XnestServer                    NO
 #define XVirtualFramebufferServer      NO
 #define BuildFreetype2Library          YES
 #define HasFreetype2                   NO
 #define BuildXTrueType                 NO
 #define BuildType1                     NO
 #define BuildCID                       NO
 #define BuildSpeedo                    NO
 #define BuildFontCache                 NO
 #define BuildRender                    NO
 #define BuildRenderLibrary             NO
 #define BuildRandRLibrary              NO
 #define BuildXcursorLibrary            NO
 #define BuildXcursorgen                NO
+#define SharedLibFontEnc               NO
 /* CAUTION: The XF86 "smart" scheduler breaks Xprt */
 #define UseSmartScheduler              NO
 
 /* Build only Xprint applications */
 #ifndef BuildXprintAppsOnly
 #define BuildXprintAppsOnly YES
 #endif /* BuildXprintAppsOnly */
 
 /* Set our own XVendorString/XVendorRelease
  * (and to avoid that xfree86.cf sets it's own stuff here) */
 #define XVendorString "xprint.mozdev.org"
 #define XVendorRelease 100000
 
 #define UseHackLinkAgainstInstalledX11Libs NO
 #if UseHackLinkAgainstInstalledX11Libs
 /* "Hack" to reuse an already installed X11 distribution when linking our
  * programs (this assumes that the installed X version is at least X11R6.4) */
 # ifndef IBMArchitecture
 #  define LdPreLib -L$(USRLIBDIR) -R$(USRLIBDIR) -L$(BUILDLIBDIR)
 # endif /* !IBMArchitecture */
@@ -205,60 +206,64 @@
    /* 32bit SPARC */
 #  define CcCmd                       /opt/SUNWspro/bin/cc
 #  define CplusplusCmd                /opt/SUNWspro/bin/CC
 #else
    /* 64bit sparc (Doesn't really work yet because the Xservers cannot link properly... ;-( */
 #  define ServerExtraDefines   -D_XSERVER64
 #  define CcCmd                       /opt/SUNWspro/bin/cc -xarch=v9a
 #  define CplusplusCmd                /opt/SUNWspro/bin/CC -xarch=v9a
 #  define UsrLibDir /usr/openwin/lib/sparcv9
 #endif
 
 #if 0 /* Development only */
    XCOMM Explicitly use "-xs" to make Rational Purify "happy"
 #  undef OptimizedCDebugFlags
 #  define OptimizedCDebugFlags -xs -g -DDEBUG_$(LOGNAME)
 #endif
 
 XCOMM #### FreeBSD-specifc stuff ... ####
 #elif defined(FreeBSDArchitecture)
 #define ProjectRoot /usr/X11R6
+#define XPrintDir   /etc/X11/xserver
 #define DlLibrary -lc
 #undef XF86SVGAServer
 #define XF86SVGAServer NO
 #define HasVarDirectory NO
 #define HasMotif2 YES
 #define HasGhostScript YES
 #define InstallXF86EncodingFiles NO
 
 XCOMM #### NetBSD-specifc stuff ... ####
 #elif defined(NetBSDArchitecture)
 #define ProjectRoot /usr/X11R6
+#define XPrintDir   /etc/X11/xserver
 #undef XF86SVGAServer   
 #define XF86SVGAServer NO 
 #define HasVarDirectory NO
 #define HasMotif2 YES   
 #define HasGhostScript YES
 #define InstallXF86EncodingFiles NO
 
 XCOMM #### Linux-specifc stuff ... ####
 #elif defined(LinuxArchitecture)
+#define ProjectRoot /usr/X11R6
+#define XPrintDir   /etc/X11/xserver
 #undef XF86SVGAServer
 #define XF86SVGAServer NO
 #define HasVarDirectory NO
 #define HasMotif2 YES
 #define HasGhostScript YES
 #define InstallXF86EncodingFiles NO
 /* Debian Xprint package puts the Xprt config files elsewhere */
 #if (LinuxDistribution == LinuxDebian)
 # define XPrintDir /usr/share/Xprint/xserver 
 #endif
 
 #endif
 
 /* Do not strip binaries to ensure usefull stacktraces in bug reports
  * (http://xprint.mozdev.org/bugs/show_bug.cgi?id=2264)
  */
 #define StripInstalledPrograms	NO
 
 /* Is Motif2 installed ? */
 #ifndef HasMotif2
Index: xc/packager/tarball/make_xprint_binary_tarball.sh
===================================================================
RCS file: /cvs/xorg/xc/packager/tarball/Attic/make_xprint_binary_tarball.sh,v
retrieving revision 1.1.2.1
diff -u -2 -0 -r1.1.2.1 make_xprint_binary_tarball.sh
--- a/xc/packager/tarball/make_xprint_binary_tarball.sh	13 Apr 2004 03:16:32 -0000	1.1.2.1
+++ b/xc/packager/tarball/make_xprint_binary_tarball.sh	15 Apr 2004 00:05:22 -0000
@@ -270,40 +270,43 @@
     fi
   done
   
   # Part 2: Test "PSdefault" printer model
   cd ${XPINSTALLDIR_BASE}
   x=`cat "xprint/install/${REL_XPRINTDIR}/C/print/models/PSdefault/fonts/fonts.dir" | wc -l`
   if [ "$x" -ne 31 ] ; then
     echo "PSdefault model fonts.dir misses font entries."
     status=false
   fi
   
   if ${status} ; then
     echo "No errors found."
   else
     fatal_error "Verification failed."
   fi
 )
 [ $? != 0 ] && exit 1;
 echo "##        Verification of installation DONE."
 
+# Sort and cleanup list of files (and filter the dirs)
+BINFILELIST="`(cd ${XPINSTALLDIR_BASE} ; find ${BINFILELIST} \! -type d) | sort | uniq`"
+ 
 # Step 5.a:
 # Create binary tarball
 inc_step_counter
 echo "## Step ${step}: Create binary tarball..."
 (
   cd ${XPINSTALLDIR_BASE}
   if has_gzip ; then
     tar -cf - ${BINFILELIST} | gzip --best --stdout >${XPTARFILE}.gz
   else
     tar -cf - ${BINFILELIST} | compress >${XPTARFILE}.Z
   fi
 )
 [ $? != 0 ] && exit 1;
 echo "##        Binary tarball creation DONE."
 
 # Step 5.b:
 # Copy binary tarball to destination, if required.
 if [ "${XPDESTTARFILE}" != "" ] ; then
     inc_step_counter
     echo "## Step ${step}: Copying binary tarball to destination..."