Date: Wed, 15 Dec 2004 23:00:18 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75113: Update port: games/qgo to 1.0.0 Message-ID: <20041215230018.40249f2d.tkato432@yahoo.com> Resent-Message-ID: <200412151410.iBFEAOhT021694@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75113
>Category: ports
>Synopsis: Update port: games/qgo to 1.0.0
>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 Dec 15 14:10:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.0
New file:
files/patch-src::mainwin.cpp
files/patch-src::wavfile.c
files/patch-src::wavplay.c
Remove file:
files/patch-qgo::Makefile.in
files/patch-qgo::src::mainwin.cpp
files/patch-qgo::src::wavfile.c
files/patch-qgo::src::wavplay.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/qgo/Makefile games/qgo/Makefile
--- /usr/ports/games/qgo/Makefile Wed Dec 8 01:37:49 2004
+++ games/qgo/Makefile Tue Dec 14 20:20:16 2004
@@ -7,7 +7,7 @@
#
PORTNAME= qgo
-PORTVERSION= 0.2.2
+PORTVERSION= 1.0.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,19 +19,16 @@
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= QTDIR=${QT_PREFIX}
-MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
- AUTOHEADER="${TRUE}"
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= QTDIR="${QT_PREFIX}"
CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
post-patch:
- @${REINPLACE_CMD} -e 's|-pedantic||g ; \
- s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|/usr/share|$${prefix}/share|g'
-
-pre-build:
- -@${RM} ${WRKSRC}/qgo/src/*_gui.cpp
- -@${RM} ${WRKSRC}/qgo/src/*_gui.h
+ @${REINPLACE_CMD} -e \
+ 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|src templates|src|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|: install-includeHEADERS|:|g' ${WRKSRC}/src/Makefile.in
.include <bsd.port.mk>
diff -urN /usr/ports/games/qgo/distinfo games/qgo/distinfo
--- /usr/ports/games/qgo/distinfo Wed Oct 27 12:08:55 2004
+++ games/qgo/distinfo Tue Dec 14 19:25:48 2004
@@ -1,2 +1,2 @@
-MD5 (qgo-0.2.2.tar.gz) = 4483bebd46ceda203b0cbad35da0a624
-SIZE (qgo-0.2.2.tar.gz) = 1751040
+MD5 (qgo-1.0.0.tar.gz) = a455fb3a850e340c9d07bb5e514026ef
+SIZE (qgo-1.0.0.tar.gz) = 1420181
diff -urN /usr/ports/games/qgo/files/patch-qgo::Makefile.in games/qgo/files/patch-qgo::Makefile.in
--- /usr/ports/games/qgo/files/patch-qgo::Makefile.in Tue May 11 13:35:03 2004
+++ games/qgo/files/patch-qgo::Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,23 +0,0 @@
---- qgo/Makefile.in.orig Mon May 10 18:33:38 2004
-+++ qgo/Makefile.in Mon May 10 18:34:44 2004
-@@ -235,7 +235,7 @@
- KDE_OPTIONS = qtonly
- qgo_LDADD = ./src/libsrc.a $(LIB_QPE) $(LIB_QT) $(LIBSOCKET)
-
--SUBDIRS = src templates
-+SUBDIRS = src
-
- EXTRA_DIST = filenew.xpm filesave.xpm fileopen.xpm ChangeLog
-
-@@ -266,6 +266,11 @@
- #>+ 1
- qgo_OBJECTS =
- qgo_DEPENDENCIES = ./src/libsrc.a
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO
-
-
diff -urN /usr/ports/games/qgo/files/patch-qgo::src::mainwin.cpp games/qgo/files/patch-qgo::src::mainwin.cpp
--- /usr/ports/games/qgo/files/patch-qgo::src::mainwin.cpp Tue Aug 24 04:01:18 2004
+++ games/qgo/files/patch-qgo::src::mainwin.cpp Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- qgo/src/mainwin.cpp.orig Sat Jun 19 07:38:43 2004
-+++ qgo/src/mainwin.cpp Sun Aug 22 15:55:59 2004
-@@ -1604,10 +1604,10 @@
- //set the params of "who command"
- if ((whoBox1->currentItem() >1) || (whoBox2->currentItem() >1))
- {
-- wparam.append(whoBox1->currentItem()==1 ? "9p" : whoBox1->currentText());
-+ wparam.append(whoBox1->currentItem()==1 ? QString("9p") : whoBox1->currentText());
- if ((whoBox1->currentItem()) && (whoBox2->currentItem()))
- wparam.append("-");
-- wparam.append(whoBox2->currentItem()==1 ? "9p" : whoBox2->currentText());
-+ wparam.append(whoBox2->currentItem()==1 ? QString("9p") : whoBox2->currentText());
- }
- else if ((whoBox1->currentItem()) || (whoBox2->currentItem()))
- wparam.append("1p-9p");
diff -urN /usr/ports/games/qgo/files/patch-qgo::src::wavfile.c games/qgo/files/patch-qgo::src::wavfile.c
--- /usr/ports/games/qgo/files/patch-qgo::src::wavfile.c Sat Aug 21 13:39:45 2004
+++ games/qgo/files/patch-qgo::src::wavfile.c Thu Jan 1 09:00:00 1970
@@ -1,28 +0,0 @@
---- qgo/src/wavfile.c.orig Mon Jun 23 23:57:08 2003
-+++ qgo/src/wavfile.c Fri Aug 20 23:10:57 2004
-@@ -53,7 +53,6 @@
- #include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <malloc.h>
- #include <string.h>
- #include <memory.h>
- #include <signal.h>
-@@ -61,7 +60,7 @@
- #include <sys/ipc.h>
- #include <sys/ioctl.h>
- #include <assert.h>
--#include <linux/soundcard.h>
-+#include <sys/soundcard.h>
-
-
- // stop
-@@ -133,7 +132,7 @@
- //static ErrFunc _v_erf; /* This module's error reporting function */
- static char emsg[2048];
-
--
-+static void _v_erf(const char *format,va_list ap);
-
- /*
- * Error reporting function for this source module:
diff -urN /usr/ports/games/qgo/files/patch-qgo::src::wavplay.c games/qgo/files/patch-qgo::src::wavplay.c
--- /usr/ports/games/qgo/files/patch-qgo::src::wavplay.c Thu Nov 6 00:58:25 2003
+++ games/qgo/files/patch-qgo::src::wavplay.c Thu Jan 1 09:00:00 1970
@@ -1,16 +0,0 @@
---- qgo/src/wavplay.c.orig Tue Jun 24 06:57:09 2003
-+++ qgo/src/wavplay.c Mon Nov 3 00:50:02 2003
-@@ -55,12 +55,11 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/stat.h>
--#include <linux/soundcard.h>
-+#include <sys/soundcard.h>
- #include "wavplay.h"
- //#include "server.h"
-
diff -urN /usr/ports/games/qgo/files/patch-src::mainwin.cpp games/qgo/files/patch-src::mainwin.cpp
--- /usr/ports/games/qgo/files/patch-src::mainwin.cpp Thu Jan 1 09:00:00 1970
+++ games/qgo/files/patch-src::mainwin.cpp Tue Dec 14 19:37:31 2004
@@ -0,0 +1,15 @@
+--- src/mainwin.cpp.orig Mon Nov 29 15:42:39 2004
++++ src/mainwin.cpp Tue Dec 14 19:37:16 2004
+@@ -1571,10 +1571,10 @@
+ //set the params of "who command"
+ if ((whoBox1->currentItem() >1) || (whoBox2->currentItem() >1))
+ {
+- wparam.append(whoBox1->currentItem()==1 ? "9p" : whoBox1->currentText());
++ wparam.append(whoBox1->currentItem()==1 ? QString("9p") : whoBox1->currentText());
+ if ((whoBox1->currentItem()) && (whoBox2->currentItem()))
+ wparam.append("-");
+- wparam.append(whoBox2->currentItem()==1 ? "9p" : whoBox2->currentText());
++ wparam.append(whoBox2->currentItem()==1 ? QString("9p") : whoBox2->currentText());
+ }
+ else if ((whoBox1->currentItem()) || (whoBox2->currentItem()))
+ wparam.append("1p-9p");
diff -urN /usr/ports/games/qgo/files/patch-src::wavfile.c games/qgo/files/patch-src::wavfile.c
--- /usr/ports/games/qgo/files/patch-src::wavfile.c Thu Jan 1 09:00:00 1970
+++ games/qgo/files/patch-src::wavfile.c Tue Dec 14 19:34:19 2004
@@ -0,0 +1,34 @@
+--- src/wavfile.c.orig Sun Oct 31 08:36:45 2004
++++ src/wavfile.c Tue Dec 14 19:34:08 2004
+@@ -41,7 +41,7 @@
+ * wavplay project.
+ */
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+
+ static const char rcsid[] = "@(#)wavfile.c $Revision: 1.6 $";
+
+@@ -52,7 +52,9 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#if defined(__linux__)
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <memory.h>
+ #include <signal.h>
+@@ -60,7 +62,12 @@
+ #include <sys/ipc.h>
+ #include <sys/ioctl.h>
+ #include <assert.h>
++#if defined(__linux__)
+ #include <linux/soundcard.h>
++#endif
++#if defined(__FreeBSD__)
++#include <sys/soundcard.h>
++#endif
+
+
+
diff -urN /usr/ports/games/qgo/files/patch-src::wavplay.c games/qgo/files/patch-src::wavplay.c
--- /usr/ports/games/qgo/files/patch-src::wavplay.c Thu Jan 1 09:00:00 1970
+++ games/qgo/files/patch-src::wavplay.c Tue Dec 14 19:32:47 2004
@@ -0,0 +1,30 @@
+--- src/wavplay.c.orig Sun Oct 31 08:35:00 2004
++++ src/wavplay.c Tue Dec 14 19:32:31 2004
+@@ -54,19 +54,26 @@
+ *
+ */
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+
+ static const char rcsid[] = "@(#)recplay.c $Revision: 1.8 $";
+
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
++#if defined(__linux__)
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#if defined(__linux__)
+ #include <linux/soundcard.h>
++#endif
++#if defined(__linux__)
++#include <sys/soundcard.h>
++#endif
+ #include "wavplay.h"
+ /*/#include "server.h"*/
+
diff -urN /usr/ports/games/qgo/pkg-plist games/qgo/pkg-plist
--- /usr/ports/games/qgo/pkg-plist Wed Feb 11 12:56:15 2004
+++ games/qgo/pkg-plist Tue Dec 14 21:02:08 2004
@@ -2,6 +2,7 @@
share/qGo/pics/Bowl.png
share/qGo/sounds/click.wav
share/qGo/sounds/connect.wav
+share/qGo/sounds/connect2.wav
share/qGo/sounds/enter.wav
share/qGo/sounds/gameend.wav
share/qGo/sounds/leave.wav
@@ -9,12 +10,15 @@
share/qGo/sounds/pass.wav
share/qGo/sounds/say.wav
share/qGo/sounds/stone.wav
+share/qGo/sounds/stone2.wav
share/qGo/sounds/talk.wav
share/qGo/sounds/tictoc.wav
+share/qGo/translations/qgo_cz.qm
share/qGo/translations/qgo_de.qm
share/qGo/translations/qgo_fr.qm
share/qGo/translations/qgo_it.qm
share/qGo/translations/qgo_nl.qm
+share/qGo/translations/qgo_zh.qm
@dirrm share/qGo/translations
@dirrm share/qGo/sounds
@dirrm share/qGo/pics
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041215230018.40249f2d.tkato432>