1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

- Fix build with gcc4

- Support SUB_FILES

PR:		114077
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
This commit is contained in:
Martin Wilke 2007-06-29 10:40:05 +00:00
parent 590a520fe9
commit 163e8381a3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=194450
7 changed files with 69 additions and 27 deletions

View File

@ -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
MLINKS= LinPopUp.1 linpopup.1
MAN1= LinPopUp.1
SUB_FILES= pkg-message
.if defined(WITH_SAMBA3)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-samba3
.endif
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Broken with gcc 4.2
.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>

View File

@ -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;

View File

@ -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;

View File

@ -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;
}

View File

@ -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"

View File

@ -0,0 +1,4 @@
Please add the following line to your smb.conf file:
message command = %%PREFIX%%/bin/LinPopUp "%f" "%m" %s; rm %s

View File

@ -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