maj footprint ettt md5sum foomatic-db

15 files changed, 673 insertions, 17 deletions

diff --git a/extra/firefox/.md5sum b/extra/firefox/.md5sum
index cb583cdb4..8096386fa 100644
--- a/extra/firefox/.md5sum
+++ b/extra/firefox/.md5sum
@@ -1,4 +1,4 @@
-66b1610362ed6009d66fe762645679a0  firefox-3.6.4.source.tar.bz2
+c9a071b31bb90d05edfb93117d0a7537  firefox-3.6.6.source.tar.bz2
 68cf02788491c6e846729b2f2913bf79  firefox.desktop
 658183e3e94959582c3bd382644692ea  fr.xpi
 0ce15c57ad95ec84d688188d1ac6e64a  mozconfig
diff --git a/extra/foomatic-db/.footprint b/extra/foomatic-db/.footprint
index 0fe513f0b..d6f68bea5 100755
--- a/extra/foomatic-db/.footprint
+++ b/extra/foomatic-db/.footprint
@@ -1447,15 +1447,29 @@ drwxr-sr-x	2011/2000	usr/share/foomatic/db/source/PPD/Lanier/PXL/
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_906EX_PXL.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_907EX_PXL.ppd.gz
 drwxr-sr-x	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C510.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C520.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C522.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C524.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C540.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C543.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C544.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C546.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C734.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C736.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C750.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C752.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C780.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C782.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C910.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C912.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C930.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_C935.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E260.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E260d.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E260dn.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E350d.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E352dn.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E360d.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E360dn.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_E460dn.ppd.gz
@@ -1493,6 +1507,8 @@ drwxr-sr-x	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X860de.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X862de.ppd.gz
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X864de.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X940e.ppd.gz
+-rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/Lexmark/Lexmark_X945e.ppd.gz
 drwxr-sr-x	2011/2000	usr/share/foomatic/db/source/PPD/NRG/
 drwxr-sr-x	2011/2000	usr/share/foomatic/db/source/PPD/NRG/PS/
 -rw-r--r--	2011/2000	usr/share/foomatic/db/source/PPD/NRG/PS/NRG-10515_10518_10512_PS.ppd.gz
@@ -2959,8 +2975,6 @@ drwxr-xr-x	root/root	usr/share/foomatic/db/source/opt/
 -rw-r--r--	root/root	usr/share/foomatic/db/source/opt/ppmtomd-PrintColors.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/opt/ppmtomd-PrintingMethod.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/opt/ppmtomd-UseMultiColourRibbon.xml
--rw-r--r--	root/root	usr/share/foomatic/db/source/opt/pxlmono-GSResolution.xml
--rw-r--r--	root/root	usr/share/foomatic/db/source/opt/pxlmono-JCLResolution.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/opt/pxlmono-PrinterResolution.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/opt/pxlmono-PrintoutMode.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/opt/s400a1-Resolution.xml
@@ -3113,6 +3127,7 @@ drwxr-xr-x	root/root	usr/share/foomatic/db/source/printer/
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-1950.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-1950VP.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-1960.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-2300.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-2420PC.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-2450DX.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Brother-PT-2500PC.xml
@@ -4102,6 +4117,8 @@ drwxr-xr-x	root/root	usr/share/foomatic/db/source/printer/
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1018.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1020.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1022.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1022n.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1022nw.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1100.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1100A.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_1150.xml
@@ -4211,6 +4228,7 @@ drwxr-xr-x	root/root	usr/share/foomatic/db/source/printer/
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P2014.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P2015.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P2055d.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P2055dn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P3004.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P3005.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/HP-LaserJet_P4014.xml
@@ -4895,15 +4913,19 @@ drwxr-xr-x	root/root	usr/share/foomatic/db/source/printer/
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C770n.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C772dn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C772n.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C780.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C780dn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C780dtn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C780n.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C782.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C782dn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C782dtn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C782n.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C910.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C912.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C920n.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C930.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C935.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C935dn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C935dtn.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-C935hdn.xml
@@ -4999,6 +5021,8 @@ drwxr-xr-x	root/root	usr/share/foomatic/db/source/printer/
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-X860de.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-X862de.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-X864de.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-X940e.xml
+-rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-X945e.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-Z11.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-Z12.xml
 -rw-r--r--	root/root	usr/share/foomatic/db/source/printer/Lexmark-Z13.xml
diff --git a/extra/foomatic-db/.md5sum b/extra/foomatic-db/.md5sum
index d4f344dd7..c3f67df21 100755
--- a/extra/foomatic-db/.md5sum
+++ b/extra/foomatic-db/.md5sum
@@ -1 +1 @@
-c12b364df4006635db073b0e06c9027d  foomatic-db-4.0-current.tar.gz
+88e4498390ad82ff13f8c7f43520e786  foomatic-db-4.0-current.tar.gz
diff --git a/extra/lapack/Makefile.blas b/extra/lapack/Makefile.blas
new file mode 100644
index 000000000..be2a5eb9f
--- /dev/null
+++ b/extra/lapack/Makefile.blas
@@ -0,0 +1,32 @@
+clean:
+	rm -f *.o libblas.a libblas.so*
+
+OBJS=	caxpy.o ccopy.o cdotc.o cdotu.o cgbmv.o cgemm.o cgemv.o \
+	cgerc.o cgeru.o chbmv.o chemm.o chemv.o cher2.o cher2k.o \
+	cher.o cherk.o chpmv.o chpr2.o chpr.o crotg.o cscal.o csrot.o \
+	csscal.o cswap.o csymm.o csyr2k.o csyrk.o ctbmv.o ctbsv.o \
+	ctpmv.o ctpsv.o ctrmm.o ctrmv.o ctrsm.o ctrsv.o dasum.o \
+	daxpy.o dcabs1.o dcopy.o ddot.o dgbmv.o dgemm.o dgemv.o \
+	dger.o dnrm2.o drot.o drotg.o drotm.o drotmg.o dsbmv.o \
+	dscal.o dsdot.o dspmv.o dspr2.o dspr.o dswap.o dsymm.o \
+	dsymv.o dsyr2.o dsyr2k.o dsyr.o dsyrk.o dtbmv.o dtbsv.o \
+	dtpmv.o dtpsv.o dtrmm.o dtrmv.o dtrsm.o dtrsv.o dzasum.o \
+	dznrm2.o icamax.o idamax.o isamax.o izamax.o lsame.o sasum.o \
+	saxpy.o scabs1.o scasum.o scnrm2.o scopy.o sdot.o sdsdot.o \
+	sgbmv.o sgemm.o sgemv.o sger.o snrm2.o srot.o srotg.o srotm.o \
+	srotmg.o ssbmv.o sscal.o sspmv.o sspr2.o sspr.o sswap.o \
+	ssymm.o ssymv.o ssyr2.o ssyr2k.o ssyr.o ssyrk.o stbmv.o \
+	stbsv.o stpmv.o stpsv.o strmm.o strmv.o strsm.o strsv.o \
+	xerbla_array.o xerbla.o zaxpy.o zcopy.o zdotc.o zdotu.o \
+	zdrot.o zdscal.o zgbmv.o zgemm.o zgemv.o zgerc.o zgeru.o \
+	zhbmv.o zhemm.o zhemv.o zher2.o zher2k.o zher.o zherk.o \
+	zhpmv.o zhpr2.o zhpr.o zrotg.o zscal.o zswap.o zsymm.o \
+	zsyr2k.o zsyrk.o ztbmv.o ztbsv.o ztpmv.o ztpsv.o ztrmm.o \
+	ztrmv.o ztrsm.o ztrsv.o
+
+static: $(OBJS)
+	ar ruv libblas.a $(OBJS)
+	ranlib libblas.a
+
+shared: $(OBJS)
+	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.2.1 $(OBJS) -lm -lgfortran -lc
diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack
new file mode 100644
index 000000000..b377538b5
--- /dev/null
+++ b/extra/lapack/Makefile.lapack
@@ -0,0 +1,293 @@
+include ../make.inc
+
+clean:
+	rm -f *.o liblapack*
+
+OBJS=	cbdsqr.o cgbbrd.o cgbcon.o cgbequb.o cgbequ.o cgbrfs.o \
+	cgbsv.o cgbsvx.o cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o \
+	cgebal.o cgebd2.o cgebrd.o cgecon.o cgeequb.o cgeequ.o cgees.o \
+	cgeesx.o cgeev.o cgeevx.o cgegs.o cgegv.o cgehd2.o cgehrd.o cgelq2.o \
+	cgelqf.o cgelsd.o cgels.o cgelss.o cgelsx.o cgelsy.o cgeql2.o \
+	cgeqlf.o cgeqp3.o cgeqpf.o cgeqr2.o cgeqrf.o cgerfs.o \
+	cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesvd.o cgesv.o cgesvx.o \
+	cgetc2.o cgetf2.o cgetrf.o cgetri.o cgetrs.o cggbak.o \
+	cggbal.o cgges.o cggesx.o cggev.o cggevx.o cggglm.o cgghrd.o \
+	cgglse.o cggqrf.o cggrqf.o cggsvd.o cggsvp.o cgtcon.o cgtrfs.o \
+	cgtsv.o cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbevd.o chbev.o \
+	chbevx.o chbgst.o chbgvd.o chbgv.o chbgvx.o chbtrd.o checon.o \
+	cheequb.o cheevd.o cheev.o cheevr.o cheevx.o chegs2.o chegst.o \
+	chegvd.o chegv.o chegvx.o cherfs.o chesv.o chesvx.o \
+	chetd2.o chetf2.o chetrd.o chetrf.o chetri.o chetrs.o \
+	chfrk.o chgeqz.o chla_transtype.o chpcon.o chpevd.o chpev.o \
+	chpevx.o chpgst.o chpgvd.o chpgv.o chpgvx.o chprfs.o chpsv.o \
+	chpsvx.o chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o \
+	clabrd.o clacgv.o clacn2.o clacon.o clacp2.o clacpy.o clacrm.o \
+	clacrt.o cladiv.o claed0.o claed7.o claed8.o claein.o claesy.o \
+	claev2.o clag2z.o \
+	clags2.o clagtm.o \
+	clahef.o \
+	clahqr.o clahr2.o clahrd.o claic1.o \
+	clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o clanhb.o \
+	clanhe.o clanhf.o clanhp.o clanhs.o clanht.o clansb.o clansp.o \
+	clansy.o clantb.o clantp.o clantr.o clapll.o clapmt.o \
+	claqgb.o claqge.o claqhb.o claqhe.o claqhp.o \
+	claqp2.o claqps.o claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o \
+	claqr5.o claqsb.o claqsp.o claqsy.o clar1v.o clar2v.o clarcm.o \
+	clarfb.o clarf.o clarfg.o clarfp.o clarft.o clarfx.o clargv.o \
+	clarnv.o clarrv.o clartg.o clartv.o \
+	clarzb.o clarz.o clarzt.o clascl.o claset.o clasr.o \
+	classq.o claswp.o clasyf.o \
+	clatbs.o \
+	clatdf.o clatps.o clatrd.o clatrs.o clatrz.o clatzm.o clauu2.o \
+	clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
+	cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpftrf.o cpftri.o cpftrs.o \
+	cpocon.o cpoequb.o cpoequ.o cporfs.o cposv.o cposvx.o \
+	cpotf2.o cpotrf.o cpotri.o cpotrs.o cppcon.o cppequ.o \
+	cpprfs.o cppsv.o cppsvx.o cpptrf.o cpptri.o cpptrs.o cpstf2.o \
+	cpstrf.o cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o \
+	cpttrs.o cptts2.o crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
+	cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o cstegr.o \
+	cstein.o cstemr.o csteqr.o csycon.o csyequb.o csymv.o csyr.o \
+	csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o \
+	csytri.o csytrs.o ctbcon.o ctbrfs.o ctbtrs.o ctfsm.o ctftri.o \
+	ctfttp.o ctfttr.o ctgevc.o ctgex2.o ctgexc.o ctgsen.o ctgsja.o \
+	ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o ctprfs.o ctptri.o ctptrs.o \
+	ctpttf.o ctpttr.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o \
+	ctrsna.o ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctrttf.o ctrttp.o \
+	ctzrqf.o ctzrzf.o cung2l.o cung2r.o cungbr.o cunghr.o cungl2.o \
+	cunglq.o cungql.o cungqr.o cungr2.o cungrq.o cungtr.o cunm2l.o \
+	cunm2r.o cunmbr.o cunmhr.o cunml2.o cunmlq.o cunmql.o cunmqr.o \
+	cunmr2.o cunmr3.o cunmrq.o cunmrz.o cunmtr.o cupgtr.o cupmtr.o \
+	dbdsdc.o dbdsqr.o ddisna.o dgbbrd.o dgbcon.o dgbequb.o dgbequ.o \
+	dgbrfs.o dgbsv.o dgbsvx.o dgbtf2.o dgbtrf.o \
+ 	dgbtrs.o dgebak.o dgebal.o dgebd2.o dgebrd.o dgecon.o dgeequb.o \
+ 	dgeequ.o dgees.o dgeesx.o dgeev.o dgeevx.o dgegs.o dgegv.o \
+	dgehd2.o dgehrd.o dgejsv.o dgelq2.o dgelqf.o dgelsd.o dgels.o \
+	dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o dgeqp3.o dgeqpf.o \
+	dgeqr2.o dgeqrf.o dgerfs.o dgerq2.o dgerqf.o dgesc2.o \
+	dgesdd.o dgesvd.o dgesv.o dgesvj.o dgesvx.o dgetc2.o \
+	dgetf2.o dgetrf.o dgetri.o dgetrs.o dggbak.o dggbal.o dgges.o \
+	dggesx.o dggev.o dggevx.o dggglm.o dgghrd.o dgglse.o dggqrf.o \
+	dggrqf.o dggsvd.o dggsvp.o dgsvj0.o dgsvj1.o dgtcon.o dgtrfs.o \
+	dgtsv.o dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o dhsein.o \
+	dhseqr.o disnan.o dlabad.o dlabrd.o dlacn2.o dlacon.o dlacpy.o \
+	dladiv.o dlae2.o dlaebz.o dlaed0.o dlaed1.o dlaed2.o dlaed3.o \
+	dlaed4.o dlaed5.o dlaed6.o dlaed7.o dlaed8.o dlaed9.o dlaeda.o \
+	dlaein.o dlaev2.o dlaexc.o dlag2.o dlag2s.o \
+	dlags2.o dlagtf.o dlagtm.o \
+	dlagts.o dlagv2.o dlahqr.o dlahr2.o dlahrd.o dlaic1.o \
+	dlaisnan.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
+	dlamrg.o dlaneg.o dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o \
+	dlansf.o dlansp.o dlanst.o dlansy.o dlantb.o dlantp.o dlantr.o \
+	dlanv2.o dlapll.o dlapmt.o \
+	dlapy2.o dlapy3.o dlaqgb.o dlaqge.o dlaqp2.o \
+	dlaqps.o dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
+	dlaqsb.o dlaqsp.o dlaqsy.o dlaqtr.o dlar1v.o dlar2v.o dlarfb.o \
+	dlarf.o dlarfg.o dlarfp.o dlarft.o dlarfx.o dlargv.o dlarnv.o \
+	dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o \
+	dlarrf.o dlarrj.o dlarrk.o dlarrr.o dlarrv.o \
+	dlartg.o dlartv.o dlaruv.o dlarzb.o dlarz.o dlarzt.o dlas2.o \
+	dlascl.o dlasd0.o dlasd1.o dlasd2.o dlasd3.o \
+	dlasd4.o dlasd5.o dlasd6.o dlasd7.o dlasd8.o dlasda.o dlasdq.o \
+	dlasdt.o dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o \
+	dlasq6.o dlasr.o dlasrt.o dlassq.o dlasv2.o dlaswp.o dlasy2.o \
+	dlasyf.o \
+	dlat2s.o dlatbs.o dlatdf.o dlatps.o dlatrd.o \
+	dlatrs.o dlatrz.o dlatzm.o dlauu2.o dlauum.o \
+	dopgtr.o dopmtr.o dorg2l.o dorg2r.o dorgbr.o dorghr.o dorgl2.o \
+	dorglq.o dorgql.o dorgqr.o dorgr2.o dorgrq.o dorgtr.o dorm2l.o \
+	dorm2r.o dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o \
+	dormr2.o dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o \
+	dpbrfs.o dpbstf.o dpbsv.o dpbsvx.o dpbtf2.o dpbtrf.o dpbtrs.o \
+	dpftrf.o dpftri.o dpftrs.o dpocon.o dpoequb.o dpoequ.o \
+	dporfs.o dposv.o dposvx.o dpotf2.o dpotrf.o \
+	dpotri.o dpotrs.o dppcon.o dppequ.o dpprfs.o dppsv.o dppsvx.o \
+	dpptrf.o dpptri.o dpptrs.o dpstf2.o dpstrf.o dptcon.o dpteqr.o \
+	dptrfs.o dptsv.o dptsvx.o dpttrf.o dpttrs.o dptts2.o drscl.o \
+	dsbevd.o dsbev.o dsbevx.o dsbgst.o dsbgvd.o dsbgv.o dsbgvx.o \
+	dsbtrd.o dsfrk.o dsgesv.o dspcon.o dspevd.o dspev.o dspevx.o \
+	dspgst.o dspgvd.o dspgv.o dspgvx.o dsposv.o dsprfs.o dspsv.o \
+	dspsvx.o dsptrd.o dsptrf.o dsptri.o dsptrs.o dstebz.o dstedc.o \
+	dstegr.o dstein.o dstemr.o dsteqr.o dsterf.o dstevd.o dstev.o \
+	dstevr.o dstevx.o dsycon.o dsyequb.o dsyevd.o dsyev.o dsyevr.o \
+	dsyevx.o dsygs2.o dsygst.o dsygvd.o dsygv.o dsygvx.o dsyrfs.o \
+	dsysv.o dsysvx.o dsytd2.o dsytf2.o dsytrd.o \
+	dsytrf.o dsytri.o dsytrs.o dtbcon.o dtbrfs.o dtbtrs.o dtfsm.o \
+	dtftri.o dtfttp.o dtfttr.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
+	dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
+	dtptrs.o dtpttf.o dtpttr.o dtrcon.o dtrevc.o dtrexc.o dtrrfs.o \
+	dtrsen.o dtrsna.o dtrsyl.o dtrti2.o dtrtri.o dtrtrs.o dtrttf.o \
+	dtrttp.o dtzrqf.o dtzrzf.o dzsum1.o icmax1.o ieeeck.o ilaclc.o \
+	ilaclr.o iladiag.o iladlc.o iladlr.o ilaenv.o ilaprec.o \
+	ilaslc.o ilaslr.o ilatrans.o ilauplo.o ilaver.o ilazlc.o \
+	ilazlr.o iparmq.o izmax1.o lsamen.o sbdsdc.o sbdsqr.o scsum1.o \
+	sdisna.o sgbbrd.o sgbcon.o sgbequb.o sgbequ.o sgbrfs.o \
+	sgbsv.o sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o \
+	sgebak.o sgebal.o sgebd2.o sgebrd.o sgecon.o sgeequb.o sgeequ.o \
+	sgees.o sgeesx.o sgeev.o sgeevx.o sgegs.o sgegv.o sgehd2.o \
+	sgehrd.o sgejsv.o sgelq2.o sgelqf.o sgelsd.o sgels.o sgelss.o \
+	sgelsx.o sgelsy.o sgeql2.o sgeqlf.o sgeqp3.o sgeqpf.o sgeqr2.o \
+	sgeqrf.o sgerfs.o sgerq2.o sgerqf.o sgesc2.o sgesdd.o \
+	sgesvd.o sgesv.o sgesvj.o sgesvx.o sgetc2.o sgetf2.o \
+	sgetrf.o sgetri.o sgetrs.o sggbak.o sggbal.o sgges.o sggesx.o \
+	sggev.o sggevx.o sggglm.o sgghrd.o sgglse.o sggqrf.o sggrqf.o \
+	sggsvd.o sggsvp.o sgsvj0.o sgsvj1.o sgtcon.o sgtrfs.o sgtsv.o \
+	sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o shsein.o shseqr.o \
+	sisnan.o slabad.o slabrd.o slacn2.o slacon.o slacpy.o sladiv.o \
+	slae2.o slaebz.o slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o \
+	slaed5.o slaed6.o slaed7.o slaed8.o slaed9.o slaeda.o slaein.o \
+	slaev2.o slaexc.o slag2d.o slag2.o \
+	slags2.o slagtf.o slagtm.o slagts.o \
+	slagv2.o slahqr.o slahr2.o slahrd.o slaic1.o slaisnan.o \
+	slaln2.o slals0.o slalsa.o slalsd.o slamrg.o \
+	slaneg.o slangb.o slange.o slangt.o slanhs.o slansb.o slansf.o \
+	slansp.o slanst.o slansy.o slantb.o slantp.o slantr.o slanv2.o \
+	slapll.o slapmt.o \
+	slapy2.o slapy3.o slaqgb.o slaqge.o slaqp2.o \
+	slaqps.o slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
+	slaqsb.o slaqsp.o slaqsy.o slaqtr.o slar1v.o slar2v.o slarfb.o \
+	slarf.o slarfg.o slarfp.o slarft.o slarfx.o slargv.o slarnv.o \
+	slarra.o slarrb.o slarrc.o slarrd.o slarre.o \
+	slarrf.o slarrj.o slarrk.o slarrr.o slarrv.o \
+	slartg.o slartv.o slaruv.o slarzb.o slarz.o slarzt.o slas2.o \
+	slascl.o slasd0.o slasd1.o slasd2.o slasd3.o \
+	slasd4.o slasd5.o slasd6.o slasd7.o slasd8.o slasda.o slasdq.o \
+	slasdt.o slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o \
+	slasq6.o slasr.o slasrt.o slassq.o slasv2.o slaswp.o slasy2.o \
+	slasyf.o slatbs.o slatdf.o slatps.o slatrd.o slatrs.o \
+	slatrz.o slatzm.o slauu2.o slauum.o sopgtr.o \
+	sopmtr.o sorg2l.o sorg2r.o sorgbr.o sorghr.o sorgl2.o sorglq.o \
+	sorgql.o sorgqr.o sorgr2.o sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
+	sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
+	sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
+	spbstf.o spbsv.o spbsvx.o spbtf2.o spbtrf.o spbtrs.o spftrf.o \
+	spftri.o spftrs.o spocon.o spoequb.o spoequ.o sporfs.o \
+	sposv.o sposvx.o spotf2.o spotrf.o \
+	spotri.o spotrs.o sppcon.o sppequ.o spprfs.o sppsv.o sppsvx.o \
+	spptrf.o spptri.o spptrs.o spstf2.o spstrf.o sptcon.o spteqr.o \
+	sptrfs.o sptsv.o sptsvx.o spttrf.o spttrs.o sptts2.o srscl.o \
+	ssbevd.o ssbev.o ssbevx.o ssbgst.o ssbgvd.o ssbgv.o ssbgvx.o \
+	ssbtrd.o ssfrk.o sspcon.o sspevd.o sspev.o sspevx.o sspgst.o \
+	sspgvd.o sspgv.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
+	ssptrf.o ssptri.o ssptrs.o sstebz.o sstedc.o sstegr.o sstein.o \
+	sstemr.o ssteqr.o ssterf.o sstevd.o sstev.o sstevr.o sstevx.o \
+	ssycon.o ssyequb.o ssyevd.o ssyev.o ssyevr.o ssyevx.o ssygs2.o \
+	ssygst.o ssygvd.o ssygv.o ssygvx.o ssyrfs.o ssysv.o \
+	ssysvx.o ssytd2.o ssytf2.o ssytrd.o ssytrf.o \
+	ssytri.o ssytrs.o stbcon.o stbrfs.o stbtrs.o stfsm.o stftri.o \
+	stfttp.o stfttr.o stgevc.o stgex2.o stgexc.o stgsen.o stgsja.o \
+	stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o stptrs.o \
+	stpttf.o stpttr.o strcon.o strevc.o strexc.o strrfs.o strsen.o \
+	strsna.o strsyl.o strti2.o strtri.o strtrs.o strttf.o strttp.o \
+	stzrqf.o stzrzf.o xerbla_array.o xerbla.o zbdsqr.o zcgesv.o \
+	zcposv.o zdrscl.o zgbbrd.o zgbcon.o zgbequb.o zgbequ.o \
+	zgbrfs.o zgbsv.o zgbsvx.o zgbtf2.o \
+	zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o zgecon.o \
+	zgeequb.o zgeequ.o zgees.o zgeesx.o zgeev.o zgeevx.o zgegs.o \
+	zgegv.o zgehd2.o zgehrd.o zgelq2.o zgelqf.o zgelsd.o zgels.o \
+	zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
+	zgeqpf.o zgeqr2.o zgeqrf.o zgerfs.o zgerq2.o \
+	zgerqf.o zgesc2.o zgesdd.o zgesvd.o zgesv.o zgesvx.o \
+	zgetc2.o zgetf2.o zgetrf.o zgetri.o zgetrs.o zggbak.o zggbal.o \
+	zgges.o zggesx.o zggev.o zggevx.o zggglm.o zgghrd.o zgglse.o \
+	zggqrf.o zggrqf.o zggsvd.o zggsvp.o zgtcon.o zgtrfs.o zgtsv.o \
+	zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbevd.o zhbev.o zhbevx.o \
+	zhbgst.o zhbgvd.o zhbgv.o zhbgvx.o zhbtrd.o zhecon.o zheequb.o \
+	zheevd.o zheev.o zheevr.o zheevx.o zhegs2.o zhegst.o zhegvd.o \
+	zhegv.o zhegvx.o zherfs.o zhesv.o zhesvx.o \
+	zhetd2.o zhetf2.o zhetrd.o zhetrf.o zhetri.o zhetrs.o zhfrk.o \
+	zhgeqz.o zhpcon.o zhpevd.o zhpev.o zhpevx.o zhpgst.o zhpgvd.o \
+	zhpgv.o zhpgvx.o zhprfs.o zhpsv.o zhpsvx.o zhptrd.o zhptrf.o \
+	zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o zlacgv.o zlacn2.o \
+	zlacon.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o zlaed0.o \
+	zlaed7.o zlaed8.o zlaein.o zlaesy.o zlaev2.o zlag2c.o \
+	zlags2.o \
+	zlagtm.o zlahef.o \
+	zlahqr.o zlahr2.o \
+	zlahrd.o zlaic1.o zlals0.o zlalsa.o zlalsd.o \
+	zlangb.o zlange.o zlangt.o zlanhb.o zlanhe.o zlanhf.o zlanhp.o \
+	zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o zlantp.o \
+	zlantr.o zlapll.o zlapmt.o \
+	zlaqgb.o zlaqge.o \
+	zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqr0.o zlaqr1.o \
+	zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o zlaqsb.o zlaqsp.o zlaqsy.o \
+	zlar1v.o zlar2v.o zlarcm.o zlarfb.o zlarf.o zlarfg.o zlarfp.o \
+	zlarft.o zlarfx.o zlargv.o zlarnv.o zlarrv.o \
+	zlartg.o zlartv.o zlarzb.o zlarz.o zlarzt.o \
+	zlascl.o zlaset.o zlasr.o zlassq.o zlaswp.o \
+	zlasyf.o \
+	zlat2c.o zlatbs.o \
+	zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
+	zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o \
+	zpbsv.o zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpftrf.o zpftri.o \
+	zpftrs.o zpocon.o zpoequb.o zpoequ.o zporfs.o \
+	zposv.o zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o \
+	zppcon.o zppequ.o zpprfs.o zppsv.o zppsvx.o zpptrf.o zpptri.o \
+	zpptrs.o zpstf2.o zpstrf.o zptcon.o zpteqr.o zptrfs.o zptsv.o \
+	zptsvx.o zpttrf.o zpttrs.o zptts2.o zrot.o zspcon.o zspmv.o \
+	zspr.o zsprfs.o zspsv.o zspsvx.o zsptrf.o zsptri.o zsptrs.o \
+	zstedc.o zstegr.o zstein.o zstemr.o zsteqr.o zsycon.o \
+	zsyequb.o zsymv.o zsyr.o zsyrfs.o zsysv.o zsysvx.o \
+	zsytf2.o zsytrf.o zsytri.o zsytrs.o ztbcon.o \
+	ztbrfs.o ztbtrs.o ztfsm.o ztftri.o ztfttp.o ztfttr.o ztgevc.o \
+	ztgex2.o ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o \
+	ztpcon.o ztprfs.o ztptri.o ztptrs.o ztpttf.o ztpttr.o ztrcon.o \
+	ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o ztrsyl.o ztrti2.o \
+	ztrtri.o ztrtrs.o ztrttf.o ztrttp.o ztzrqf.o ztzrzf.o zung2l.o \
+	zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o \
+	zungr2.o zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o \
+	zunml2.o zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o \
+	zunmrz.o zunmtr.o zupgtr.o zupmtr.o ../INSTALL/dlamch.o \
+	../INSTALL/dsecnd_INT_ETIME.o ../INSTALL/lsame.o \
+	../INSTALL/second_INT_ETIME.o ../INSTALL/slamch.o
+
+SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
+   sla_gercond.o sla_rpvgrw.o ssysvxx.o ssyrfsx.o			\
+   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
+   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
+   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
+   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
+   slascl2.o sla_wwaddw.o
+
+DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
+   dla_gercond.o dla_rpvgrw.o dsysvxx.o dsyrfsx.o			\
+   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
+   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
+   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
+   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
+   dlascl2.o dla_wwaddw.o
+
+CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o		\
+   cla_gercond_c.o cla_gercond_x.o cla_rpvgrw.o				\
+   csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o		\
+   cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o			\
+   cposvxx.o cporfsx.o cla_porfsx_extended.o				\
+   cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o			\
+   cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o		\
+   cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o			\
+   chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o		\
+   cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o			\
+   cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
+
+ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
+   zla_gercond_c.o zla_gercond_x.o zla_rpvgrw.o zsysvxx.o zsyrfsx.o	\
+   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
+   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
+   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
+   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o	\
+   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
+   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
+   zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
+
+ALLXAUX =
+
+ifdef USEXBLAS
+ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX)
+endif
+
+static: $(OBJS) $(ALLXOBJ)
+	ar ruv liblapack.a $(OBJS)
+	ranlib liblapack.a
+
+shared: $(OBJS) $(ALLXOBJ)
+	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.2.1 $(OBJS) -L.. -lblas -lm -lgfortran -lc
diff --git a/extra/lapack/Pkgfile b/extra/lapack/Pkgfile
index be2741893..11200fb23 100644
--- a/extra/lapack/Pkgfile
+++ b/extra/lapack/Pkgfile
@@ -8,7 +8,8 @@ name=lapack
 version=3.2.1
 release=1
 source=(http://www.netlib.org/$name/$name-$version.tgz
-	make.inc.archlinux blas-link.patch)
+	make.inc.archlinux 
+	blas-link.patch) 
 
 build() {
   cd $name-$version
@@ -17,7 +18,6 @@ build() {
   
   # fix blas linking FS#13093
   patch -Np1 -i $SRC/blas-link.patch 
-   
   # Build with Position Independent Code (PIC) FS#12464 (i686), required for x86_64
   CFLAGS="${CFLAGS} -fPIC"
 
diff --git a/extra/lapack/lapack-3.1.1-make.inc.patch b/extra/lapack/lapack-3.1.1-make.inc.patch
new file mode 100644
index 000000000..432426c76
--- /dev/null
+++ b/extra/lapack/lapack-3.1.1-make.inc.patch
@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <meta http-equiv="generator" content="WebSVN 2.3.0" /> <!-- leave this for stats -->
+  <link rel="shortcut icon" type="image/x-icon" href="http://www.archlinux.org/media/favicon.ico" />
+  <link rel="icon" type="image/x-icon" href="http://www.archlinux.org/media/favicon.ico" />
+  <link type="text/css" href="http://www.archlinux.org/media/arch.css" rel="stylesheet" />
+  <link type="text/css" href="/templates/arch/styles.css" rel="stylesheet" media="screen" />
+  <link rel='alternate' type='application/rss+xml' title='WebSVN RSS' href='/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=rss&amp;' />
+  <!--[if gte IE 5.5000]>
+  <script type="text/javascript" src="/templates/arch/png.js"></script>
+  <style type="text/css" media="screen">
+  tbody tr td { padding:1px 0 }
+  #wrap h2 { padding:10px 5px 0 5px; margin-bottom:-8px }
+  </style>
+  <![endif]-->
+  <title>
+       Arch Linux Repositories
+          - packages
+               - Révision 82188
+            - /lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch
+  </title>
+  <script type="text/javascript">
+  //<![CDATA[
+       function getPath()
+       {
+         return '';
+       }
+       
+       function checkCB(chBox)
+       {
+          count = 0
+          first = null
+          f = chBox.form
+          for (i = 0 ; i < f.elements.length ; i++)
+          if (f.elements[i].type == 'checkbox' && f.elements[i].checked)
+          {
+             if (first == null && f.elements[i] != chBox)
+                first = f.elements[i]
+             count += 1
+          }
+          
+          if (count > 2) 
+          {
+             first.checked = false
+             count -= 1
+          }
+       }
+  //]]>
+  </script>
+  <script type="text/javascript" src="/templates/arch/collapse.js"></script>
+</head>
+<body id="file">
+<div id="container">
+        <div id="head_container">
+            <div id="title">
+              <div id="logo"><h1 id="archtitle"><a href="http://www.archlinux.org" title="Arch Linux (Home)">Arch Linux</a></h1></div>
+            </div>
+            <div id="main_nav">
+
+                <ul>
+                    <li class="selected"><a href="http://www.archlinux.org/">Home</a></li>
+                    <li><a href="http://bbs.archlinux.org/">Forums</a></li>
+                    <li><a href="http://wiki.archlinux.org/">Wiki</a></li>
+                    <li><a href="http://bugs.archlinux.org/">Bugs</a></li>
+                    <li><a href="http://aur.archlinux.org/">AUR</a></li>
+                    <li><a href="http://www.archlinux.org/download/">Download</a></li>
+                </ul>
+            </div>
+        </div>
+        <div id="content">
+	<div id="select">
+		<form action="/wsvn?" method="post" id="projectform"><input type="hidden" name="op" value="form" /><input type="hidden" name="selectproj" value="1" /><select name="repname" onchange="javascript:this.form.submit();"><option value="packages" selected="selected">packages</option><option value="community">community</option></select><noscript><input type="submit" value="Go" /></noscript></form>
+		
+		<form action="?" method="post" id="langform"><select name="langchoice" onchange="javascript:this.form.submit();"><option value="ca">Catal&agrave;-Valenci&agrave; - Catalan</option><option value="zh-CN">&#20013;&#25991; - Chinese (Simplified)</option><option value="zh-TW">&#20013;&#25991; - Chinese (Traditional)</option><option value="cs">&#268;esky - Czech</option><option value="da">Dansk - Danish</option><option value="nl">Nederlands - Dutch</option><option value="en">English - English</option><option value="fi">Suomi - Finnish</option><option value="fr" selected="selected">Fran&ccedil;ais - French</option><option value="de">Deutsch - German</option><option value="he-IL">&#1506;&#1489;&#1512;&#1497;&#1514; - Hebrew</option><option value="hu">Magyar - Hungarian</option><option value="id">Bahasa Indonesia - Indonesian</option><option value="it">Italiano - Italian</option><option value="ja">&#26085;&#26412;&#35486; - Japanese</option><option value="ko">&#54620;&#44397;&#50612; - Korean</option><option value="no">Norsk - Norwegian</option><option value="pl">Polski - Polish</option><option value="pt">Portugu&ecirc;s - Portuguese</option><option value="pt-BR">Portugu&ecirc;s - Portuguese (Brazil)</option><option value="ru">&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081; - Russian</option><option value="sk">Sloven&#269;ina - Slovak</option><option value="sl">Sloven&#269;ina - Slovenian</option><option value="es">Espa&ntilde;ol - Spanish</option><option value="sv">Svenska - Swedish</option><option value="tr">T&uuml;rk&ccedil;e - Turkish</option><option value="uz">O&euml;zbekcha - Uzbek</option></select><noscript><input type="submit" value="Go" /></noscript></form>
+	</div>
+	<h1><a href="/wsvn/?" title="Dépôts Subversion">Dépôts Subversion</a>
+		<span><a href="?repurl?">packages</a></span>
+	</h1>
+  <h2 id="pathlinks"><a href="/wsvn/packages/?" class="root"><span>(root)</span></a>/<a href="/wsvn/packages/lapack/?#">lapack</a>/<a href="/wsvn/packages/lapack/repos/?#">repos</a>/<a href="/wsvn/packages/lapack/repos/extra-i686/?#">extra-i686</a>/<span class="file">lapack-3.1.1-make.inc.patch</span> - Révision 82188</h2>
+  <div id="revjump"><form action="" method="get" id="revisionform"><input type="hidden" name="repname" value="packages" /><input type="hidden" name="path" value="/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch" />Révision <input type="text" size="5" name="rev" value="HEAD" /><span class="submit"><input type="submit" value="Go" /></span></form></div>
+  <p>
+    <span class="blame"><a href="/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=blame&amp;">Responsabilité</a></span> &#124;
+    <span class="diff"><a href="/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=diff&amp;">Différence avec la précédente</a></span> &#124;
+    <span class="changes"><a href="/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=revision&amp;">Dernière modification</a></span> &#124;
+    <span class="log"><a href="/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=log&amp;">Afficher le Journal</a></span>
+    &#124; <span class="compress"><a href="/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=dl&amp;">Télécharger</a></span>
+    &#124; <span class="feed"><a href="/wsvn/packages/lapack/repos/extra-i686/lapack-3.1.1-make.inc.patch?op=rss&amp;">Flux RSS</a></span>
+  </p>
+  <div class="listing">
+<code><PRE>
+</code><code><B><FONT COLOR="#0000FF">--- lapack-3.1.1/INSTALL/make.inc.gfortran.BAD  2007-05-25 15:34:55.000000000 -0500
+</code><code></FONT></B><B><FONT COLOR="#5F9EA0">+++ lapack-3.1.1/INSTALL/make.inc.gfortran      2007-05-25 15:35:51.000000000 -0500
+</code><code></FONT></B><I><FONT COLOR="#B22222">@@ -8,7 +8,7 @@ SHELL = /bin/sh
+</code><code></FONT></I> #
+</code><code> #  The machine (platform) identifier to append to the library names
+</code><code> #
+</code><code><B><FONT COLOR="#0000FF">-PLAT = _LINUX
+</code><code></FONT></B><B><FONT COLOR="#5F9EA0">+PLAT = 
+</code><code></FONT></B> #  
+</code><code> #  Modify the FORTRAN and OPTS definitions to refer to the
+</code><code> #  compiler and desired compiler options for your machine.  NOOPT
+</code><code><I><FONT COLOR="#B22222">@@ -17,9 +17,9 @@ PLAT = _LINUX
+</code><code></FONT></I> #  desired load options for your machine.
+</code><code> #
+</code><code> FORTRAN  = gfortran 
+</code><code><B><FONT COLOR="#0000FF">-OPTS     = -O2
+</code><code></FONT></B><B><FONT COLOR="#5F9EA0">+#OPTS     = -O2
+</code><code></FONT></B> DRVOPTS  = $(OPTS)
+</code><code><B><FONT COLOR="#0000FF">-NOOPT    = -O0
+</code><code></FONT></B><B><FONT COLOR="#5F9EA0">+NOOPT    = 
+</code><code></FONT></B> LOADER   = gfortran
+</code><code> LOADOPTS =
+</code><code> #
+</code><code></PRE>
+</code><code></code>  </div>
+        </div>

+        <div class="foot">

+          Copyright &copy; 2002-2009 <a href="mailto:jvinet@zeroflux.org" title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" title="contact Aaron Griffin">Aaron Griffin</a>.<br />

+          The Arch Linux name and logo are recognized trademarks. Some rights

+          reserved.<br />

+

+          The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.

+        </div>

+    </body>

+</html>

diff --git a/extra/libmythes/Pkgfile b/extra/libmythes/Pkgfile
index 6a79093d1..e30d54ecb 100644
--- a/extra/libmythes/Pkgfile
+++ b/extra/libmythes/Pkgfile
@@ -1,9 +1,8 @@
-# Description: a simple thesaurus, contains static library and header file needed to develop applications using mythes + perl script to create index files
+# Description: Un thesaurus simple, contient les libs statiques et entetes nécessaires à mythes + scripts perl pour créer des index
 # URL: http://hunspell.sourceforge.net/
 # Maintainer: NuTyX core team
 # Packager: lesibel at free dot fr
-# Depends on: dépendance1, dépendance2, dépendance3, ...
-
+# Depends on: hunspell
 
 name=libmythes
 version=1.2.1
diff --git a/extra/pinentry/.footprint b/extra/pinentry/.footprint
index d3de3e156..099433843 100644
--- a/extra/pinentry/.footprint
+++ b/extra/pinentry/.footprint
@@ -1,8 +1,7 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/pinentry -> pinentry-gtk
+lrwxrwxrwx	root/root	usr/bin/pinentry -> pinentry-gtk-2
 -rwxr-xr-x	root/root	usr/bin/pinentry-curses
--rwxr-xr-x	root/root	usr/bin/pinentry-gtk
 -rwxr-xr-x	root/root	usr/bin/pinentry-gtk-2
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/info/
diff --git a/extra/thunderbird/Pkgfile b/extra/thunderbird/Pkgfile
index 054c1c57a..940dec69a 100755
--- a/extra/thunderbird/Pkgfile
+++ b/extra/thunderbird/Pkgfile
@@ -5,11 +5,12 @@
 # Depends on: alsa-libs, gtk, libidl
 
 name=thunderbird
-version=3.0.5
+version=3.1
 release=1
-source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/linux-i686/fr/$name-$version.tar.bz2 \
-thunderbird.desktop \
-thunderbird.png)
+
+source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/linux-i686/fr/$name-$version.source.tar.bz2 \
+	thunderbird.desktop \
+	thunderbird.png)
 
 build() {
 	mkdir -p $PKG/{usr/bin,opt}
diff --git a/extra/tk/Pkgfile b/extra/tk/Pkgfile
index 195daec6b..b04035680 100755
--- a/extra/tk/Pkgfile
+++ b/extra/tk/Pkgfile
@@ -9,8 +9,6 @@ version=8.5.8
 release=1
 source=( http://downloads.sourceforge.net/tcl/${name}$version-src.tar.gz )
 
-
-
 build() {
 cd ${name}$version/unix
 case `uname -m` in
diff --git a/extra/vigra/.footprint b/extra/vigra/.footprint
new file mode 100644
index 000000000..c7e0efd12
--- /dev/null
+++ b/extra/vigra/.footprint
@@ -0,0 +1,142 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/vigra/
+-rw-r--r--	root/root	usr/include/vigra/accessor.hxx
+-rw-r--r--	root/root	usr/include/vigra/affine_registration.hxx
+-rw-r--r--	root/root	usr/include/vigra/affinegeometry.hxx
+-rw-r--r--	root/root	usr/include/vigra/array_vector.hxx
+-rw-r--r--	root/root	usr/include/vigra/basicgeometry.hxx
+-rw-r--r--	root/root	usr/include/vigra/basicimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/basicimageview.hxx
+-rw-r--r--	root/root	usr/include/vigra/bordertreatment.hxx
+-rw-r--r--	root/root	usr/include/vigra/boundarytensor.hxx
+-rw-r--r--	root/root	usr/include/vigra/cellconfigurations.hxx
+-rw-r--r--	root/root	usr/include/vigra/cellimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/codec.hxx
+-rw-r--r--	root/root	usr/include/vigra/colorconversions.hxx
+-rw-r--r--	root/root	usr/include/vigra/combineimages.hxx
+-rw-r--r--	root/root	usr/include/vigra/config.hxx
+-rw-r--r--	root/root	usr/include/vigra/configVersion.hxx
+-rw-r--r--	root/root	usr/include/vigra/contourcirculator.hxx
+-rw-r--r--	root/root	usr/include/vigra/convolution.hxx
+-rw-r--r--	root/root	usr/include/vigra/copyimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/cornerdetection.hxx
+-rw-r--r--	root/root	usr/include/vigra/diff2d.hxx
+-rw-r--r--	root/root	usr/include/vigra/distancetransform.hxx
+-rw-r--r--	root/root	usr/include/vigra/edgedetection.hxx
+-rw-r--r--	root/root	usr/include/vigra/eigensystem.hxx
+-rw-r--r--	root/root	usr/include/vigra/error.hxx
+-rw-r--r--	root/root	usr/include/vigra/fftw.hxx
+-rw-r--r--	root/root	usr/include/vigra/fftw3.hxx
+-rw-r--r--	root/root	usr/include/vigra/fixedpoint.hxx
+-rw-r--r--	root/root	usr/include/vigra/flatmorphology.hxx
+-rw-r--r--	root/root	usr/include/vigra/functorexpression.hxx
+-rw-r--r--	root/root	usr/include/vigra/functortraits.hxx
+-rw-r--r--	root/root	usr/include/vigra/gaborfilter.hxx
+-rw-r--r--	root/root	usr/include/vigra/gaussians.hxx
+-rw-r--r--	root/root	usr/include/vigra/gradient_energy_tensor.hxx
+-rw-r--r--	root/root	usr/include/vigra/hdf5impex.hxx
+-rw-r--r--	root/root	usr/include/vigra/imagecontainer.hxx
+-rw-r--r--	root/root	usr/include/vigra/imageinfo.hxx
+-rw-r--r--	root/root	usr/include/vigra/imageiterator.hxx
+-rw-r--r--	root/root	usr/include/vigra/imageiteratoradapter.hxx
+-rw-r--r--	root/root	usr/include/vigra/impex.hxx
+-rw-r--r--	root/root	usr/include/vigra/initimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/inspectimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/interpolating_accessor.hxx
+-rw-r--r--	root/root	usr/include/vigra/iteratoradapter.hxx
+-rw-r--r--	root/root	usr/include/vigra/iteratortags.hxx
+-rw-r--r--	root/root	usr/include/vigra/iteratortraits.hxx
+-rw-r--r--	root/root	usr/include/vigra/labelimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/labelvolume.hxx
+-rw-r--r--	root/root	usr/include/vigra/linear_algebra.hxx
+-rw-r--r--	root/root	usr/include/vigra/linear_solve.hxx
+-rw-r--r--	root/root	usr/include/vigra/localminmax.hxx
+-rw-r--r--	root/root	usr/include/vigra/mathutil.hxx
+-rw-r--r--	root/root	usr/include/vigra/matlab.hxx
+-rw-r--r--	root/root	usr/include/vigra/matlab_FLEXTYPE.hxx
+-rw-r--r--	root/root	usr/include/vigra/matrix.hxx
+-rw-r--r--	root/root	usr/include/vigra/memory.hxx
+-rw-r--r--	root/root	usr/include/vigra/meshgrid.hxx
+-rw-r--r--	root/root	usr/include/vigra/metaprogramming.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_array.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_convolution.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_distance.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_impex.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_iterator.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_morphology.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_pointoperators.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_resize.hxx
+-rw-r--r--	root/root	usr/include/vigra/multi_tensorutilities.hxx
+-rw-r--r--	root/root	usr/include/vigra/navigator.hxx
+-rw-r--r--	root/root	usr/include/vigra/noise_normalization.hxx
+-rw-r--r--	root/root	usr/include/vigra/nonlineardiffusion.hxx
+-rw-r--r--	root/root	usr/include/vigra/numerictraits.hxx
+-rw-r--r--	root/root	usr/include/vigra/numpy_array.hxx
+-rw-r--r--	root/root	usr/include/vigra/numpy_array_converters.hxx
+-rw-r--r--	root/root	usr/include/vigra/orientedtensorfilters.hxx
+-rw-r--r--	root/root	usr/include/vigra/pixelneighborhood.hxx
+-rw-r--r--	root/root	usr/include/vigra/polynomial.hxx
+-rw-r--r--	root/root	usr/include/vigra/promote_traits.hxx
+-rw-r--r--	root/root	usr/include/vigra/promote_traits.hxx.py
+-rw-r--r--	root/root	usr/include/vigra/python_utility.hxx
+-rw-r--r--	root/root	usr/include/vigra/quadprog.hxx
+-rw-r--r--	root/root	usr/include/vigra/random.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest.hxx
+drwxr-xr-x	root/root	usr/include/vigra/random_forest/
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_common.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_decisionTree.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_earlystopping.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_nodeproxy.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_online_prediction_set.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_preprocessing.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_region.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_sampling.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_split.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest/rf_visitors.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest_deprec.hxx
+-rw-r--r--	root/root	usr/include/vigra/random_forest_hdf5_impex.hxx
+-rw-r--r--	root/root	usr/include/vigra/rational.hxx
+-rw-r--r--	root/root	usr/include/vigra/recursiveconvolution.hxx
+-rw-r--r--	root/root	usr/include/vigra/regression.hxx
+-rw-r--r--	root/root	usr/include/vigra/resampling_convolution.hxx
+-rw-r--r--	root/root	usr/include/vigra/resizeimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/rfftw.hxx
+-rw-r--r--	root/root	usr/include/vigra/rgbvalue.hxx
+-rw-r--r--	root/root	usr/include/vigra/seededregiongrowing.hxx
+-rw-r--r--	root/root	usr/include/vigra/seededregiongrowing3d.hxx
+-rw-r--r--	root/root	usr/include/vigra/separableconvolution.hxx
+-rw-r--r--	root/root	usr/include/vigra/singular_value_decomposition.hxx
+-rw-r--r--	root/root	usr/include/vigra/sized_int.hxx
+-rw-r--r--	root/root	usr/include/vigra/slanted_edge_mtf.hxx
+-rw-r--r--	root/root	usr/include/vigra/splineimageview.hxx
+-rw-r--r--	root/root	usr/include/vigra/splines.hxx
+-rw-r--r--	root/root	usr/include/vigra/static_assert.hxx
+-rw-r--r--	root/root	usr/include/vigra/stdconvolution.hxx
+-rw-r--r--	root/root	usr/include/vigra/stdimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/stdimagefunctions.hxx
+-rw-r--r--	root/root	usr/include/vigra/symmetry.hxx
+-rw-r--r--	root/root	usr/include/vigra/tensorutilities.hxx
+-rw-r--r--	root/root	usr/include/vigra/tiff.hxx
+-rw-r--r--	root/root	usr/include/vigra/timing.hxx
+-rw-r--r--	root/root	usr/include/vigra/tinyvector.hxx
+-rw-r--r--	root/root	usr/include/vigra/transformimage.hxx
+-rw-r--r--	root/root	usr/include/vigra/tuple.hxx
+-rw-r--r--	root/root	usr/include/vigra/union_find.hxx
+-rw-r--r--	root/root	usr/include/vigra/utilities.hxx
+-rw-r--r--	root/root	usr/include/vigra/voxelneighborhood.hxx
+-rw-r--r--	root/root	usr/include/vigra/watersheds.hxx
+-rw-r--r--	root/root	usr/include/vigra/watersheds3d.hxx
+-rw-r--r--	root/root	usr/include/vigra/windows.h
+drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib/libvigraimpex.so -> libvigraimpex.so.2
+lrwxrwxrwx	root/root	usr/lib/libvigraimpex.so.2 -> libvigraimpex.so.2.170
+-rwxr-xr-x	root/root	usr/lib/libvigraimpex.so.2.170
+drwxr-xr-x	root/root	usr/lib/vigra/
+-rw-r--r--	root/root	usr/lib/vigra/VigraConfig.cmake
+-rw-r--r--	root/root	usr/lib/vigra/vigra-targets-release.cmake
+-rw-r--r--	root/root	usr/lib/vigra/vigra-targets.cmake
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/licenses/
+drwxr-xr-x	root/root	usr/share/licenses/vigra/
+-rw-r--r--	root/root	usr/share/licenses/vigra/LICENSE
diff --git a/extra/vigra/.md5sum b/extra/vigra/.md5sum
new file mode 100644
index 000000000..74f0773ab
--- /dev/null
+++ b/extra/vigra/.md5sum
@@ -0,0 +1,2 @@
+db610e48558eb323490ad21d636bac76  libpng-1.4.patch
+a40b3b013653f75dc84ba55b2df1fae2  vigra-1.7.0-src.tar.gz
diff --git a/extra/vigra/Pkgfile b/extra/vigra/Pkgfile
new file mode 100644
index 000000000..aa2fd743e
--- /dev/null
+++ b/extra/vigra/Pkgfile
@@ -0,0 +1,25 @@
+# Description: Computer vision library
+# URL: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
+# Maintainer: NuTyX core team
+# Packager: lesibel at free dot fr
+# Depends on: libpng, libtiff, gcc-libs, sh
+
+name=vigra
+version=1.7.0
+release=1
+source=(http://hci.iwr.uni-heidelberg.de/$name/$name-$version-src.tar.gz 
+        libpng-1.4.patch)
+
+
+build() {
+	cd $name-$version-src
+	patch -p1 < $SRC/libpng-1.4.patch
+
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        	-DWITH_VIGRANUMPY=1 \
+        	-DDOCINSTALL=share/doc 
+  	make 
+	make DESTDIR=$PKG install
+	install -D -m644 LICENSE.txt $PKG/usr/share/licenses/$name/LICENSE
+}
+
diff --git a/extra/vigra/libpng-1.4.patch b/extra/vigra/libpng-1.4.patch
new file mode 100644
index 000000000..3c69e8eb8
--- /dev/null
+++ b/extra/vigra/libpng-1.4.patch
@@ -0,0 +1,14 @@
+diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx
+--- vigra1.6.0-orig/src/impex/png.cxx	2010-01-20 19:46:57.000000000 -0500
++++ vigra1.6.0/src/impex/png.cxx	2010-01-20 19:47:55.000000000 -0500
+@@ -270,8 +270,8 @@
+         // expand gray values to at least one byte size
+         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+             if (setjmp(png->jmpbuf))
+-                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+-            png_set_gray_1_2_4_to_8(png);
++                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++            png_set_expand_gray_1_2_4_to_8(png);
+             bit_depth = 8;
+         }
+