Rene Rebe:

* merged r3310 and r3311 from branches/2.0-stable:
	  * added pkgconfig to minimal+free pkgsel template
	  * converted xpdf to a more new-style .conf, automatically applying the
	    patches with the new per xtar patchfile encoding
	  * fixed xpdf to build when tetex is not installed


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3312 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

misc/pkgsel/minimal+xfree.in

@@ -90,6 +90,7 @@ pkgfilter sed '
 / psmisc /                      { p; d; };
 / pciutils/                     { p; d; };
 / screen /                      { p; d; };
+/ pkgconfig /			{ p; d; };
 / sed /                         { p; d; };
 / shadow /                      { p; d; };
 / sysfiles /                    { p; d; };

package/rene/xpdf/t1-ps.patch → package/rene/xpdf/ps.patch.t1lib

@@ -20,8 +20,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./T1Lib-1.3/doc/Makefile.in.old	Sat Feb  9 02:07:38 2002
-+++ ./T1Lib-1.3/doc/Makefile.in	Sat Feb  9 02:12:32 2002
+--- T1Lib-1.3/doc/Makefile.in.old	Sat Feb  9 02:07:38 2002
++++ T1Lib-1.3/doc/Makefile.in	Sat Feb  9 02:12:32 2002
 @@ -74,7 +74,7 @@
  
  

package/rene/xpdf/xpdf.conf

@@ -20,34 +20,21 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-xpdf_conf ()
+xpdf_pc ()
 {
-    echo "Extracting sources ...."
-    tar $taropt $archdir/t1lib-1.3.tar.bz2
-    tar $taropt $archdir/xpdf-$ver.tar.bz2
-    
-    for x in $patchfiles ; do
-    if [ -f $x ] ; then
-	echo "Apply patch $x ..."
-	patch -Nfp1 < $x
-    fi ; done
-						  
-    
-    # first install the T1lib for truetype font support
-    cd T1Lib-1.3/
-    eval ./configure $confopt
-    eval "$MAKE $makeopt"
-    eval "$MAKE install"
-    cd ..
-    
-    # now install the main stuff
-    cd xpdf-$ver
-    eval ./configure $confopt --enable-a4-paper --with-gzip \
-                     --with-freetype2-includes=/usr/include/freetype2
-    eval "$MAKE $makeopt" ; eval "$MAKE install"
-    cd ..
+	[ "$xmakeopt" ] || xmakeopt="$makeopt"
+
+	if [[ $xsrctar = *t1lib* ]] ; then
+		echo "DOCSUBDIRS set ..."
+		pkginstalled tetex || var_append makeopt " " "DOCSUBDIRS="
+		echo "makeopt: $makeopt"
+	else
+		makeopt="$xmakeopt"
+		extraconfopt="--enable-a4-paper --with-gzip \
+		              --with-freetype2-includes=/usr/include/freetype2"
+	fi
+	makeinstopt="$makeopt install"
 }
 
-custmain="xpdf_conf"
-autoextract=0
+hook_add preconf 3 xpdf_pc
 

package/rene/xpdf/xpdf.desc

@@ -38,6 +38,8 @@
 [V] 3.00
 [P] X -----5---9 177.800
 
-[D] 980943908 xpdf-3.00.tar.gz ftp://ftp.foolabs.com/pub/xpdf/
+[SRC] .
+
 [D] 5395543 t1lib-1.3.tar.gz ftp://ftp.foolabs.com/pub/xpdf/
+[D] 980943908 xpdf-3.00.tar.gz ftp://ftp.foolabs.com/pub/xpdf/