Date: Thu, 28 Jun 2007 02:00:20 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/114077: Update port: net-im/linpopup Message-ID: <20070628020020.44cebb05.tkato432@yahoo.com> Resent-Message-ID: <200706271710.l5RHA8ql074575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114077
>Category: ports
>Synopsis: Update port: net-im/linpopup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 27 17:10:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Fix build with gcc4
- Support SUB_FILES
New file:
files/patch-io.c
files/pkg-message.in
Remove file:
pkg-message
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net-im/linpopup/Makefile net-im/linpopup/Makefile
--- /usr/ports/net-im/linpopup/Makefile Sun May 27 22:40:38 2007
+++ net-im/linpopup/Makefile Sun Jun 24 00:17:15 2007
@@ -18,26 +18,20 @@
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 -urN /usr/ports/net-im/linpopup/files/patch-aa net-im/linpopup/files/patch-aa
--- /usr/ports/net-im/linpopup/files/patch-aa Thu Dec 14 12:40:31 2000
+++ net-im/linpopup/files/patch-aa Sun Jun 24 00:22:03 2007
@@ -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 -urN /usr/ports/net-im/linpopup/files/patch-ab net-im/linpopup/files/patch-ab
--- /usr/ports/net-im/linpopup/files/patch-ab Thu Dec 14 12:40:31 2000
+++ net-im/linpopup/files/patch-ab Sun Jun 24 00:06:38 2007
@@ -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 -urN /usr/ports/net-im/linpopup/files/patch-ac net-im/linpopup/files/patch-ac
--- /usr/ports/net-im/linpopup/files/patch-ac Thu Dec 14 12:40:31 2000
+++ net-im/linpopup/files/patch-ac Sun Jun 24 00:09:20 2007
@@ -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 -urN /usr/ports/net-im/linpopup/files/patch-io.c net-im/linpopup/files/patch-io.c
--- /usr/ports/net-im/linpopup/files/patch-io.c Thu Jan 1 09:00:00 1970
+++ net-im/linpopup/files/patch-io.c Sun Jun 24 00:08:45 2007
@@ -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 -urN /usr/ports/net-im/linpopup/files/pkg-message.in net-im/linpopup/files/pkg-message.in
--- /usr/ports/net-im/linpopup/files/pkg-message.in Thu Jan 1 09:00:00 1970
+++ net-im/linpopup/files/pkg-message.in Sun Jun 24 00:13:28 2007
@@ -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 -urN /usr/ports/net-im/linpopup/pkg-message net-im/linpopup/pkg-message
--- /usr/ports/net-im/linpopup/pkg-message Thu Dec 14 12:40:29 2000
+++ net-im/linpopup/pkg-message Thu Jan 1 09:00:00 1970
@@ -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
-
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070628020020.44cebb05.tkato432>