Fix the build after glib 2.34 update.

Submitted by:	miwi
Approved by:	portmgr (miwi)
Obtained from:	debian patchtracker (adapted from)

3 files changed, 44 insertions, 8 deletions

diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile
index 1ef6d2e5b197..7b1658341946 100644
--- a/graphics/picpuz/Makefile
+++ b/graphics/picpuz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	picpuz
 PORTVERSION=	2.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics games
 MASTER_SITES=	http://kornelix.squarespace.com/storage/downloads/
 
diff --git a/graphics/picpuz/files/patch-zfuncs.cpp b/graphics/picpuz/files/patch-zfuncs.cpp
index 0bfebfc1f6dc..f5e5d7f228f2 100644
--- a/graphics/picpuz/files/patch-zfuncs.cpp
+++ b/graphics/picpuz/files/patch-zfuncs.cpp
@@ -1,7 +1,7 @@
---- zfuncs.cpp.orig	2009-10-02 03:20:15.000000000 +0700
-+++ zfuncs.cpp	2009-10-07 12:35:45.000000000 +0700
+--- zfuncs.cpp.orig	2009-10-29 08:38:40.000000000 +0000
++++ zfuncs.cpp	2013-03-30 09:06:21.000000000 +0000
 @@ -23,6 +23,11 @@
- //     zfuncs version  v.2.25
+ //     zfuncs.cpp   version  v.2.28
  
  #include "zfuncs.h"
 +#ifdef __FreeBSD__
@@ -12,7 +12,16 @@
  
  /**************************************************************************
     system-level utility functions
-@@ -2875,7 +2880,7 @@
+@@ -236,7 +241,7 @@
+ //  safely access parameters from multiple threads
+ //  limitation: one lock for any number of parameters
+ 
+-mutex    zget_lock = PTHREAD_MUTEX_INITIALIZER;
++mutex_tp    zget_lock = PTHREAD_MUTEX_INITIALIZER;
+ 
+ int zget_locked(int &param)                                                //  lock and return parameter
+ {
+@@ -2916,7 +2921,7 @@
     strcpy(zicondir,zdatadir);
     strcat(zicondir,"/icons");
  
@@ -21,3 +30,12 @@
     if (strEqu(pp,"root")) snprintf(zuserdir,199,"/root/.%s",zappname);     //  get /root/.appname
     else snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);           //  or /home/user/.appname
  
+@@ -3415,7 +3420,7 @@
+ pthread_t   tids[tmax];
+ int         tlocks[tmax];
+ int         zinit = 0;
+-mutex       zmutex;
++mutex_tp       zmutex;
+ 
+ void zlockInit()                                                           //  initz. call from main()
+ {
diff --git a/graphics/picpuz/files/patch-zfuncs.h b/graphics/picpuz/files/patch-zfuncs.h
index c8493303d282..64aab991edc2 100644
--- a/graphics/picpuz/files/patch-zfuncs.h
+++ b/graphics/picpuz/files/patch-zfuncs.h
@@ -1,6 +1,6 @@
---- zfuncs.h.orig	2009-10-07 08:40:43.000000000 +0700
-+++ zfuncs.h	2009-10-07 08:50:37.000000000 +0700
-@@ -19,7 +19,201 @@
+--- zfuncs.h.orig	2009-10-29 08:38:40.000000000 +0000
++++ zfuncs.h	2013-03-30 09:03:57.000000000 +0000
+@@ -36,7 +36,201 @@
  #include <signal.h>
  #include <execinfo.h>
  #include <locale.h>
@@ -203,3 +203,21 @@
  
  #define  int8   char                                                       //  number types
  #define  int16  short
+@@ -52,7 +246,7 @@
+ 
+ #define  wstrerror(err) strerror(WEXITSTATUS(err))                         //  get text status for child process
+ 
+-#define  mutex          pthread_mutex_t                                    //  abbreviations
++#define  mutex_tp          pthread_mutex_t                                    //  abbreviations
+ #define  mutex_init     pthread_mutex_init
+ #define  mutex_lock     pthread_mutex_lock
+ #define  mutex_trylock  pthread_mutex_trylock
+@@ -495,7 +689,7 @@
+ {
+    char        wmi[8];

+    Vxstring  * vd;                                                         //  vector of xstrings

+-   mutex       qmutex;                                                     //  for multi-thread access

++   mutex_tp       qmutex;                                                     //  for multi-thread access

+    int         qcap;                                                       //  queue capacity
+    int         qcount;                                                     //  curr. queue count

+    int         ent1;                                                       //  first entry pointer