Unbreak the build and installation on PowerPC.

4 files changed, 168 insertions, 1 deletions

diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index cea3f0ddf355..f319fb2b4716 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -23,7 +23,6 @@ USES=		tar:bzip2
 USE_XORG=	xinerama
 GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	DOCS
-BROKEN_powerpc=	Does not install on powerpc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@OPTIM@|-DHAVE_CONFIG_H|g' ${WRKSRC}/Makefile.in
diff --git a/graphics/flphoto/files/patch-camera.cxx b/graphics/flphoto/files/patch-camera.cxx
index 7da3e1a666aa..14be5750a069 100644
--- a/graphics/flphoto/files/patch-camera.cxx
+++ b/graphics/flphoto/files/patch-camera.cxx
@@ -8,3 +8,21 @@
  #  define fl_mkdir(p)	mkdir(p, 0777)
  #endif // WIN32 && !__CYGWIN__
  #include <errno.h>
+@@ -63,8 +64,7 @@
+ static void	get_files(Camera *camera, const char *folder,
+ 		          CameraList *list, GPContext *context);
+ static unsigned	progress_start(GPContext *context, float target,
+-			       const char *format, va_list args,
+-        		       void *data);
++			       const char *format, void *data);
+ static void	progress_update(GPContext *context, unsigned id, float current,
+ 		                void *data);
+ static void	purge_thumbnails(void);
+@@ -909,7 +909,6 @@
+ progress_start(GPContext  *context,	// I - Current context
+                float      target,	// I - Target size
+ 	       const char *format,	// I - Progress text, if any
+-	       va_list    args,		// I - Pointer to additional args
+                void       *data)	// I - Callback data
+ {
+   Fl_Progress	*p = (Fl_Progress *)data;
diff --git a/graphics/flphoto/files/patch-po_it.po b/graphics/flphoto/files/patch-po_it.po
new file mode 100644
index 000000000000..54d8daa92c6b
--- /dev/null
+++ b/graphics/flphoto/files/patch-po_it.po
@@ -0,0 +1,75 @@
+--- po/it.po.orig	2006-11-18 03:24:41 UTC
++++ po/it.po
+@@ -1,5 +1,71 @@
+ msgid ""
+-msgstr "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2003-01-15 07:14-0500\nPO-Revision-Date: 2006-03-21 16:28+0100\nLast-Translator: Giacomo Margarito <giacomomargarito@libero.it>\nLanguage-Team: LANGUAGE <LL@li.org>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\nAre you sure you want to adjust the brightness and contrast\nand save all of the selected images?Siete sicuri di voler regolare la luminosità ed il contrasto di tutte le immagini selezionate\ne di volerlesalvare?Directory %s does not exist.\n\nCreate directory?La cartella %s non esiste.\n\nVolete crearla?Image file %s already exists!\n\nOK to overwrite?Il file di immagine %s esiste già!\n\nOK per sovrascrivere?Print file %s already exists.\nOK to overwrite?La stampa del file %s esiste già.\nOK per sovrascrivere?Purging %s will delete the file from disk.\n\nReally delete?L'eliminazione del file %s lo cancellerà dal disco.\n\nVolete eliminarlo per davvero?Sorry, no cameras were found.\nIs your camera connected to a USB port and turned on?Nessuna fotocamera trovata.\nla fotocamera è connessa ad una porta USB ed accesa?The image %s has not been saved?\n\nSave it now?L'immagine %s non è stata salvata?\n\nSalvarla ora?Unable to create %s:\n\n%sImpossibile creare %s:\n\n%sUnable to create JPEG image:\n\n%sImpossibile creare l'immagine JPEG:\n\n%sUnable to create PNG data:\n\n%sImpossibile creare i dati PNG:\n\n%sUnable to create PNG image information:\n\n%sImpossibile creare le informazioni PNG:\n\n%sUnable to create PNG image:\n\n%sImpossibile creare l'immagine PNG:\n\n%sUnable to create destination URL:\n\n%d - %sImpossibile creare l'URL di destinazione:\n\n%d - %sUnable to create directory %s:\n\n%sImpossibile creare la cartella %s:\n\n%sUnable to create image %s:\n\n%sImpossibile creare l'immagine %s:\n\n%sUnable to create temporary thumbnail image %s:\n\n%sImpossibile creare l'anteprima temporanea dell'immagine %s:\n\n%sUnable to open album file \"%s\":\n\n%sImpossibile aprire il file dell'album \"%s\":\n\n%sUnable to open original JPEG image:\n\n%sImpossibile aprire il file JPEG originale:\n\n%sUnable to rename %s:\n\n%sImpossibile rinominare %s:\n\n%sUnable to save album file \"%s\":\n\n%sImpossibile salvare il file dell'album \"%s\":\n\n%sUnable to write PNG image:\n\n%sImpossibile salvare l'immagine PNG:\n\n%sWarning: Re-saving %s will cause a loss of quality!\nDo you wish to overwrite the original JPEG file?Attenzione: il nuovo salvataggio %s causerà una perdita di qualità!\nVolete sovrascrivere il file JPEG originale?"
++msgstr "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2003-01-15 07:14-0500\nPO-Revision-Date: 2006-03-21 16:28+0100\nLast-Translator: Giacomo Margarito <giacomomargarito@libero.it>\nLanguage-Team: LANGUAGE <LL@li.org>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\n"
++
++msgid "Are you sure you want to adjust the brightness and contrast\nand save all of the selected images?"
++msgstr "Siete sicuri di voler regolare la luminosità ed il contrasto di tutte le immagini selezionate\ne di volerlesalvare?"
++
++msgid "Directory %s does not exist.\n\nCreate directory?"
++msgstr "La cartella %s non esiste.\n\nVolete crearla?"
++
++msgid "Image file %s already exists!\n\nOK to overwrite?"
++msgstr "Il file di immagine %s esiste già!\n\nOK per sovrascrivere?"
++
++msgid "Print file %s already exists.\nOK to overwrite?"
++msgstr "La stampa del file %s esiste già.\nOK per sovrascrivere?"
++
++msgid "Purging %s will delete the file from disk.\n\nReally delete?"
++msgstr "L'eliminazione del file %s lo cancellerà dal disco.\n\nVolete eliminarlo per davvero?"
++
++msgid "Sorry, no cameras were found.\nIs your camera connected to a USB port and turned on?"
++msgstr "Nessuna fotocamera trovata.\nla fotocamera è connessa ad una porta USB ed accesa?"
++
++msgid "The image %s has not been saved?\n\nSave it now?"
++msgstr "L'immagine %s non è stata salvata?\n\nSalvarla ora?"
++
++msgid "Unable to create %s:\n\n%s"
++msgstr "Impossibile creare %s:\n\n%s"
++
++msgid "Unable to create JPEG image:\n\n%s"
++msgstr "Impossibile creare l'immagine JPEG:\n\n%s"
++
++msgid "Unable to create PNG data:\n\n%s"
++msgstr "Impossibile creare i dati PNG:\n\n%s"
++
++msgid "Unable to create PNG image information:\n\n%s"
++msgstr "Impossibile creare le informazioni PNG:\n\n%s"
++
++msgid "Unable to create PNG image:\n\n%s"
++msgstr "Impossibile creare l'immagine PNG:\n\n%s"
++
++msgid "Unable to create destination URL:\n\n%d - %s"
++msgstr "Impossibile creare l'URL di destinazione:\n\n%d - %s"
++
++msgid "Unable to create directory %s:\n\n%s"
++msgstr "Impossibile creare la cartella %s:\n\n%s"
++
++msgid "Unable to create image %s:\n\n%s"
++msgstr "Impossibile creare l'immagine %s:\n\n%s"
++
++msgid "Unable to create temporary thumbnail image %s:\n\n%s"
++msgstr "Impossibile creare l'anteprima temporanea dell'immagine %s:\n\n%s"
++
++msgid "Unable to open album file \"%s\":\n\n%s"
++msgstr "Impossibile aprire il file dell'album \"%s\":\n\n%s"
++
++msgid "Unable to open original JPEG image:\n\n%s"
++msgstr "Impossibile aprire il file JPEG originale:\n\n%s"
++
++msgid "Unable to rename %s:\n\n%s"
++msgstr "Impossibile rinominare %s:\n\n%s"
++
++msgid "Unable to save album file \"%s\":\n\n%s"
++msgstr "Impossibile salvare il file dell'album \"%s\":\n\n%s"
++
++msgid "Unable to write PNG image:\n\n%s"
++msgstr "Impossibile salvare l'immagine PNG:\n\n%s"
++
++msgid "Warning: Re-saving %s will cause a loss of quality!\nDo you wish to overwrite the original JPEG file?"
++msgstr "Attenzione: il nuovo salvataggio %s causerà una perdita di qualità!\nVolete sovrascrivere il file JPEG originale?"
+ 
+ msgid " Selected Images"
+ msgstr "Immagini selezionate"
diff --git a/graphics/flphoto/files/patch-po_sv.po b/graphics/flphoto/files/patch-po_sv.po
new file mode 100644
index 000000000000..bc5925adaed3
--- /dev/null
+++ b/graphics/flphoto/files/patch-po_sv.po
@@ -0,0 +1,75 @@
+--- po/sv.po.orig	2006-11-18 03:24:41 UTC
++++ po/sv.po
+@@ -1,5 +1,71 @@
+ msgid ""
+-msgstr "Project-Id-Version: flphoto 1.2\nPOT-Creation-Date: 2003-01-15 07:14-0500\nPO-Revision-Date: 2005-12-29 05:14+0100\nLast-Translator: Daniel Nylander <po@danielnylander.se>\nLanguage-Team: Swedish <tp-sv@listor.tp-sv.se>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\nAre you sure you want to adjust the brightness and contrast\nand save all of the selected images?Är du säker att du vill justera ljusstyrka och kontrast för\nalla valda bilder och spara alla?Directory %s does not exist.\n\nCreate directory?Katalogen %s existerar inte.\n\nSkapa katalog?Image file %s already exists!\n\nOK to overwrite?Bildfilen %s existerar redan!\n\nOK att skriva över?Print file %s already exists.\nOK to overwrite?Utskriftsfilen %s existerar redan.\nOK att skriva över?Purging %s will delete the file from disk.\n\nReally delete?Rensning av %s kommer att ta bort filen från disk.\n\nVerkligen ta bort?Sorry, no cameras were found.\nIs your camera connected to a USB port and turned on?Tyvärr, inga kameror hittades.\nÄr din kamera ansluten till en USB-port och påslagen?The image %s has not been saved?\n\nSave it now?Bilden %s har inte blivit sparad?\n\nSpara den nu?Unable to create %s:\n\n%sKunde inte skapa %s:\n\n%sUnable to create JPEG image:\n\n%sKunde inte skapa JPEG-bild:\n\n%sUnable to create PNG data:\n\n%sKunde inte skapa PNG-data:\n\n%sUnable to create PNG image information:\n\n%sKunde inte skapa PNG-bildinformation:\n\n%sUnable to create PNG image:\n\n%sKunde inte skapa PNG-bild:\n\n%sUnable to create destination URL:\n\n%d - %sKunde inte skapa destinations-URL:\n\n%d - %sUnable to create directory %s:\n\n%sKunde inte skapa katalog %s:\n\n%sUnable to create image %s:\n\n%sKunde inte skapa bild %s:\n\n%sUnable to create temporary thumbnail image %s:\n\n%sKunde inte skapa temporär miniatyrbild %s:\n\n%sUnable to open album file \"%s\":\n\n%sKunde inte öppna albumfil \"%s\":\n\n%sUnable to open original JPEG image:\n\n%sKunde inte öppna original JPEG-bild:\n\n%sUnable to rename %s:\n\n%sKunde inte byta namn på %s:\n\n%sUnable to save album file \"%s\":\n\n%sKunde inte spara albumfil \"%s\":\n\n%sUnable to write PNG image:\n\n%sKunde inte skriva PNG-bild:\n\n%sWarning: Re-saving %s will cause a loss of quality!\nDo you wish to overwrite the original JPEG file?Varning: Spara %s igen kommer att sänka kvaliteten!\nVill du skriva över original JPEG-filen?"
++msgstr "Project-Id-Version: flphoto 1.2\nPOT-Creation-Date: 2003-01-15 07:14-0500\nPO-Revision-Date: 2005-12-29 05:14+0100\nLast-Translator: Daniel Nylander <po@danielnylander.se>\nLanguage-Team: Swedish <tp-sv@listor.tp-sv.se>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=iso-8859-1\nContent-Transfer-Encoding: 8bit\n"
++
++msgid "Are you sure you want to adjust the brightness and contrast\nand save all of the selected images?"
++msgstr "Är du säker att du vill justera ljusstyrka och kontrast för\nalla valda bilder och spara alla?"
++
++msgid "Directory %s does not exist.\n\nCreate directory?"
++msgstr "Katalogen %s existerar inte.\n\nSkapa katalog?"
++
++msgid "Image file %s already exists!\n\nOK to overwrite?"
++msgstr "Bildfilen %s existerar redan!\n\nOK att skriva över?"
++
++msgid "Print file %s already exists.\nOK to overwrite?"
++msgstr "Utskriftsfilen %s existerar redan.\nOK att skriva över?"
++
++msgid "Purging %s will delete the file from disk.\n\nReally delete?"
++msgstr "Rensning av %s kommer att ta bort filen från disk.\n\nVerkligen ta bort?"
++
++msgid "Sorry, no cameras were found.\nIs your camera connected to a USB port and turned on?"
++msgstr "Tyvärr, inga kameror hittades.\nÄr din kamera ansluten till en USB-port och påslagen?"
++
++msgid "The image %s has not been saved?\n\nSave it now?"
++msgstr "Bilden %s har inte blivit sparad?\n\nSpara den nu?"
++
++msgid "Unable to create %s:\n\n%s"
++msgstr "Kunde inte skapa %s:\n\n%s"
++
++msgid "Unable to create JPEG image:\n\n%s"
++msgstr "Kunde inte skapa JPEG-bild:\n\n%s"
++
++msgid "Unable to create PNG data:\n\n%s"
++msgstr "Kunde inte skapa PNG-data:\n\n%s"
++
++msgid "Unable to create PNG image information:\n\n%s"
++msgstr "Kunde inte skapa PNG-bildinformation:\n\n%s"
++
++msgid "Unable to create PNG image:\n\n%s"
++msgstr "Kunde inte skapa PNG-bild:\n\n%s"
++
++msgid "Unable to create destination URL:\n\n%d - %s"
++msgstr "Kunde inte skapa destinations-URL:\n\n%d - %s"
++
++msgid "Unable to create directory %s:\n\n%s"
++msgstr "Kunde inte skapa katalog %s:\n\n%s"
++
++msgid "Unable to create image %s:\n\n%s"
++msgstr "Kunde inte skapa bild %s:\n\n%s"
++
++msgid "Unable to create temporary thumbnail image %s:\n\n%s"
++msgstr "Kunde inte skapa temporär miniatyrbild %s:\n\n%s"
++
++msgid "Unable to open album file \"%s\":\n\n%s"
++msgstr "Kunde inte öppna albumfil \"%s\":\n\n%s"
++
++msgid "Unable to open original JPEG image:\n\n%s"
++msgstr "Kunde inte öppna original JPEG-bild:\n\n%s"
++
++msgid "Unable to rename %s:\n\n%s"
++msgstr "Kunde inte byta namn på %s:\n\n%s"
++
++msgid "Unable to save album file \"%s\":\n\n%s"
++msgstr "Kunde inte spara albumfil \"%s\":\n\n%s"
++
++msgid "Unable to write PNG image:\n\n%s"
++msgstr "Kunde inte skriva PNG-bild:\n\n%s"
++
++msgid "Warning: Re-saving %s will cause a loss of quality!\nDo you wish to overwrite the original JPEG file?"
++msgstr "Varning: Spara %s igen kommer att sänka kvaliteten!\nVill du skriva över original JPEG-filen?"
+ 
+ msgid " Selected Images"
+ msgstr " Valda bilder"