- Fix build after iconv change [1]

- Fix build with clang/libc++ ([2] for graphics/ipe)

While here for databases/spatialite:
- Trim Makefile headers
- Remove check for unsupported FreeBSD versions

Submitted by:	marino [1]
Reported by:	swills, antoine [1]
Submitted by:	bsam [2]
Approved by:	portmgr (bapt, implicit)

5 files changed, 73 insertions, 2 deletions

diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 2ab9e5647212..f504b8f16b13 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -30,13 +30,13 @@ RESTRICTED_FILES=	\
 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
 
 WANT_GNOME=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake iconv pkgconfig
 GNU_CONFIGURE=	yes
 
 MAN1=		macopix.1
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
diff --git a/games/macopix/files/patch-src-callbacks.c b/games/macopix/files/patch-src-callbacks.c
new file mode 100644
index 000000000000..9e0243b61d61
--- /dev/null
+++ b/games/macopix/files/patch-src-callbacks.c
@@ -0,0 +1,20 @@
+--- src/callbacks.c.orig	2008-05-25 07:40:08.000000000 +0200
++++ src/callbacks.c	2013-09-13 17:00:08.911683055 +0200
+@@ -509,7 +509,7 @@
+ 		if((win_bar_size==0)&&(mascot->no_capbar)){
+ 		  // for windows w/o title bar 
+ 		  flag_homepos=mascot->homepos_nb;
+-		  if(flag_homepos==HOMEPOS_NEVER) return;
++		  if(flag_homepos==HOMEPOS_NEVER) return(0);
+ 		}
+ 	      }
+ 	      //win_bar_size=0;
+@@ -538,7 +538,7 @@
+ 	    if((win_bar_size==0)&&(mascot->no_capbar)){
+ 	      // for windows w/o title bar 
+ 	      flag_homepos=mascot->homepos_nb;
+-	      if(flag_homepos==HOMEPOS_NEVER) return;
++	      if(flag_homepos==HOMEPOS_NEVER) return(0);
+ 	    }
+ 	    break;
+ 	  }
diff --git a/games/macopix/files/patch-src-gui.c b/games/macopix/files/patch-src-gui.c
new file mode 100644
index 000000000000..f87ab45ff531
--- /dev/null
+++ b/games/macopix/files/patch-src-gui.c
@@ -0,0 +1,20 @@
+--- src/gui.c.orig	2008-06-24 06:44:20.000000000 +0200
++++ src/gui.c	2013-09-13 14:36:40.096276204 +0200
+@@ -4557,7 +4557,7 @@
+   gchar *dest_file;
+ 
+   if(flagChildDialog){
+-    return;
++    return(NULL);
+   }
+   else{
+     flagChildDialog=TRUE;
+@@ -4637,7 +4637,7 @@
+   char win_title[64];
+ 
+   if(flagChildDialog){
+-    return;
++    return(NULL);
+   }
+   else{
+     flagChildDialog=TRUE;
diff --git a/games/macopix/files/patch-src-mail.c b/games/macopix/files/patch-src-mail.c
new file mode 100644
index 000000000000..d631d7be6aca
--- /dev/null
+++ b/games/macopix/files/patch-src-mail.c
@@ -0,0 +1,20 @@
+--- src/mail.c.orig	2008-05-24 01:14:42.000000000 +0200
++++ src/mail.c	2013-09-13 17:37:30.649560538 +0200
+@@ -1422,7 +1422,7 @@
+     froms=strbuf(NULL);
+ 
+     if((fp=fopen(mascot->mail.file,"r"))==NULL){
+-	return;
++	return(NULL);
+     }
+     
+     while(!feof(fp)){
+@@ -1545,7 +1545,7 @@
+     froms=strbuf(NULL);
+ 
+     if ((dp=opendir(mascot->mail.file))==NULL){
+-	return;
++	return(NULL);
+     }	
+     
+ 
diff --git a/games/macopix/files/patch-src-sockmsg.c b/games/macopix/files/patch-src-sockmsg.c
new file mode 100644
index 000000000000..014e1739c78a
--- /dev/null
+++ b/games/macopix/files/patch-src-sockmsg.c
@@ -0,0 +1,11 @@
+--- src/sockmsg.c.orig	2008-05-02 16:05:30.000000000 +0200
++++ src/sockmsg.c	2013-09-13 17:59:53.072457158 +0200
+@@ -276,7 +276,7 @@
+ 
+ 	fd_close(fd);
+ 	
+-	if(readsize<4) return;
++	if(readsize<4) return(0);
+ 	
+ 	strncpy(tmp,buf,2);
+ 	mode=atoi(tmp);