- Fix build with gcc4

- Support SUB_FILES

PR:		114077
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

7 files changed, 69 insertions, 27 deletions

diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile
index 00d942249234..d51a9d231150 100644
--- a/net-im/linpopup/Makefile
+++ b/net-im/linpopup/Makefile
@@ -18,26 +18,20 @@ COMMENT=	X11 port of WinPopup
 RUN_DEPENDS=	${LOCALBASE}/bin/smbclient:${PORTSDIR}/net/samba3
 
 WRKSRC=		${WRKDIR}/LinPopUp-${PORTVERSION}/src
-ALL_TARGET=
-MAN1=		linpopup.1 LinPopUp.1
 
 USE_GNOME=	gtk12
-USE_X_PREFIX=	yes
+ALL_TARGET=	LinPopUp
 
-.if defined(WITH_SAMBA3)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-samba3
-.endif
+MLINKS=		LinPopUp.1 linpopup.1
+MAN1=		LinPopUp.1
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
+.if defined(WITH_SAMBA3)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-samba3
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e "s#/doc/#/share/doc/#" ${WRKSRC}/Makefile
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/linpopup/files/patch-aa b/net-im/linpopup/files/patch-aa
index ca7726647aa2..c05424b8e8ea 100644
--- a/net-im/linpopup/files/patch-aa
+++ b/net-im/linpopup/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Mar 14 04:45:05 2000
-+++ Makefile	Mon Nov 20 15:22:53 2000
+--- Makefile.orig	Tue Mar 14 11:45:05 2000
++++ Makefile	Sun Jun 24 00:22:01 2007
 @@ -1,20 +1,21 @@
  SHELL=/bin/sh
 -CC = gcc
@@ -26,13 +26,13 @@
 +PREFIX ?= /usr/local
 +INSTALL_BINPATH = $(PREFIX)/bin
 +INSTALL_MANPATH = $(PREFIX)/man
-+DOC_DIR = $(PREFIX)/doc/$(PROGNAME)
++DOC_DIR = $(PREFIX)/share/doc/$(PROGNAME)
 +SHARE_DIR = $(PREFIX)/share/$(PROGNAME)
 +DATA_DIR ?= /var/db/linpopup
  DATA_FILE = $(DATA_DIR)/messages.dat
  
  RPM_RELEASE = 1
-@@ -22,9 +23,9 @@
+@@ -22,25 +23,25 @@
  RPM_ICONNAME = linpopup.gif
  
  
@@ -45,6 +45,27 @@
  
  
  install : 
+ 	@echo 
+-	/usr/bin/install -s -m 755 $(PROGNAME) $(INSTALL_BINPATH)
+-	/usr/bin/install -m 644 ../$(PROGNAME).1 $(INSTALL_MANPATH)/man1
++	${BSD_INSTALL_PROGRAM} $(PROGNAME) $(INSTALL_BINPATH)
++	${BSD_INSTALL_MAN} ../$(PROGNAME).1 $(INSTALL_MANPATH)/man1
+ 	ln -fs $(PROGNAME) $(INSTALL_BINPATH)/$(PROGNAME_LNK)
+ 	ln -fs $(PROGNAME).1 $(INSTALL_MANPATH)/man1/$(PROGNAME_LNK).1	
+ 	mkdir -p -m0755 $(DATA_DIR)
+ 	mkdir -p -m0755 $(DOC_DIR)
+ 	mkdir -p -m0755 $(SHARE_DIR)
+ 	mkdir -p -m0755 $(SHARE_DIR)/pixmaps
+-	/usr/bin/install -m 644 ../AUTHORS ../BUGS ../COPYING ../ChangeLog ../INSTALL \
++	${BSD_INSTALL_DATA} ../AUTHORS ../BUGS ../COPYING ../ChangeLog ../INSTALL \
+ 	../MANUAL ../NEWS ../README ../TODO ../THANKS  $(DOC_DIR)
+-	/usr/bin/install -m 644 ../pixmaps/little_igloo.xpm  $(SHARE_DIR)/pixmaps/
+-	/usr/bin/install -m 644 ../extra/gtkrc  $(SHARE_DIR)
++	${BSD_INSTALL_DATA} ../pixmaps/little_igloo.xpm  $(SHARE_DIR)/pixmaps/
++	${BSD_INSTALL_DATA} ../extra/gtkrc  $(SHARE_DIR)
+ 	@if ! test -f $(DATA_FILE); then \
+ 	  echo "Creating $(DATA_FILE), and chmod it 0666.";\
+ 	  touch $(DATA_FILE); \
 @@ -97,10 +98,10 @@
  		> ../extra/$(PROGNAME).1.in; \
  		fi;
diff --git a/net-im/linpopup/files/patch-ab b/net-im/linpopup/files/patch-ab
index 02d7dcd5c34e..d41f1d7cbd89 100644
--- a/net-im/linpopup/files/patch-ab
+++ b/net-im/linpopup/files/patch-ab
@@ -1,5 +1,14 @@
---- send.c.orig	Mon Nov 20 16:07:54 2000
-+++ send.c	Mon Nov 20 16:18:43 2000
+--- send.c.orig	Tue Mar 14 11:45:05 2000
++++ send.c	Sun Jun 24 00:06:25 2007
+@@ -70,7 +70,7 @@
+ 
+ 
+ 
+-  (char *) header_end = (char *) (head_text + hlen);
++  header_end = (gchar *) (head_text + hlen);
+ 
+ 
+   /* -- destroy erroneous embedded single-quotes. -- */
 @@ -161,7 +161,7 @@
    gchar message_text[2048];
    guint message_length;
diff --git a/net-im/linpopup/files/patch-ac b/net-im/linpopup/files/patch-ac
index a784074a2126..1a8c8aec7028 100644
--- a/net-im/linpopup/files/patch-ac
+++ b/net-im/linpopup/files/patch-ac
@@ -1,6 +1,14 @@
---- recept.c.orig	Mon Nov 20 16:20:24 2000
-+++ recept.c	Mon Nov 20 16:22:04 2000
-@@ -359,7 +359,7 @@
+--- recept.c.orig	Tue Mar 14 11:45:05 2000
++++ recept.c	Sun Jun 24 00:09:07 2007
+@@ -21,6 +21,7 @@
+ #include <gtk/gtk.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -359,7 +360,7 @@
  delete_showed_message (void)
  {
    struct linpopup_message this_message;
@@ -9,7 +17,7 @@
    int file_handle_temp, file_handle_data;
    int f;
  
-@@ -370,8 +370,7 @@
+@@ -370,8 +371,7 @@
        return;
      }
  
diff --git a/net-im/linpopup/files/patch-io.c b/net-im/linpopup/files/patch-io.c
new file mode 100644
index 000000000000..acc55699706f
--- /dev/null
+++ b/net-im/linpopup/files/patch-io.c
@@ -0,0 +1,10 @@
+--- io.c.orig	Tue Mar 14 11:45:05 2000
++++ io.c	Sun Jun 24 00:08:35 2007
+@@ -21,6 +21,7 @@
+ 
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "protos.h"
+ 
diff --git a/net-im/linpopup/files/pkg-message.in b/net-im/linpopup/files/pkg-message.in
new file mode 100644
index 000000000000..92d1a015a487
--- /dev/null
+++ b/net-im/linpopup/files/pkg-message.in
@@ -0,0 +1,4 @@
+
+Please add the following line to your smb.conf file:
+message command = %%PREFIX%%/bin/LinPopUp "%f" "%m" %s; rm %s
+
diff --git a/net-im/linpopup/pkg-message b/net-im/linpopup/pkg-message
deleted file mode 100644
index cbd4020f763d..000000000000
--- a/net-im/linpopup/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Please add the following line to your smb.conf file:
-message command = /usr/X11R6/bin/LinPopUp "%f" "%m" %s; rm %s
-