aboutsummaryrefslogtreecommitdiff
path: root/games/xlines
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2003-02-02 00:37:30 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2003-02-02 00:37:30 +0000
commit33c3afcf4c1e0ba221cc7372863d829e308bc281 (patch)
treee3b2155d8332ff524cd07d4bd614908b5eda8764 /games/xlines
parent180313e90df73da541b68484eb25b3c15c796de2 (diff)
downloadports-33c3afcf4c1e0ba221cc7372863d829e308bc281.tar.gz
ports-33c3afcf4c1e0ba221cc7372863d829e308bc281.zip
Notes
Diffstat (limited to 'games/xlines')
-rw-r--r--games/xlines/Makefile3
-rw-r--r--games/xlines/files/patch-aa16
-rw-r--r--games/xlines/files/patch-ab24
3 files changed, 31 insertions, 12 deletions
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 812f58a7e9a1..5052e1b70af8 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -13,10 +13,11 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
-USE_QT_VER= 1
+USE_QT_VER= 3
USE_X_PREFIX= yes
USE_REINPLACE= yes
NO_WRKSUBDIR= yes
+MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
pre-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e "s|`/usr/bin/printf '\r'`||g"
diff --git a/games/xlines/files/patch-aa b/games/xlines/files/patch-aa
index 1a110c11255f..9b5e76c27bf7 100644
--- a/games/xlines/files/patch-aa
+++ b/games/xlines/files/patch-aa
@@ -1,19 +1,19 @@
---- Makefile.orig Mon Apr 27 16:47:35 1998
-+++ Makefile Sun Jul 16 19:47:51 2000
+--- Makefile.orig Sun Feb 2 01:23:47 2003
++++ Makefile Sun Feb 2 01:28:23 2003
@@ -1,8 +1,8 @@
-INCDIR=/usr/local/qt/include
--CFLAGS=-O2 -I/usr/X11/include -DSHOW_NEXT_COLORS
+-CFLAGS=-O2 -I/usr/X11/include
-LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11
-CC=gcc
-MOC=/usr/local/qt/bin/moc
-+INCDIR=${X11BASE}/include/X11/qt1
-+CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS
-+LFLAGS=-L${X11BASE}/lib -lqt1 -lX11
++INCDIR=${X11BASE}/include/
++CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS ${PTHREAD_CFLAGS}
++LFLAGS=-L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS}
+CC?=gcc
-+MOC=${X11BASE}/bin/moc1
++MOC=${X11BASE}/bin/moc
SRC=lines.cpp lines.moc
- OBJECTS=lines.o
+ OBJECTS=lines.o
@@ -14,12 +14,12 @@
.SUFFIXES: .cpp
diff --git a/games/xlines/files/patch-ab b/games/xlines/files/patch-ab
index 2e74e16c0ffa..a5e11a51d8ce 100644
--- a/games/xlines/files/patch-ab
+++ b/games/xlines/files/patch-ab
@@ -1,11 +1,29 @@
---- lines.cpp.orig Sat Jan 17 18:11:13 1998
-+++ lines.cpp Fri Feb 13 23:57:07 1998
+--- lines.cpp.orig Sun Feb 2 01:23:47 2003
++++ lines.cpp Sun Feb 2 01:26:32 2003
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+
+-QColor colors[]={red,darkBlue,green,yellow,darkCyan,darkMagenta};
++QColor colors[]={QColor("red"),QColor("darkBlue"),QColor("green"),QColor("yellow"),QColor("darkCyan"),QColor("darkMagenta")};
+ #define NOCOLOR -1
+ #define RED 0
+ #define BLUE 1
@@ -502,7 +502,7 @@
score->setGeometry(300,120,85,45);
curScore=0;
score->display(0);
- movie=new QMovie("trolltech.gif");
-+ movie=new QMovie("%%PREFIX%%/share/xlines/trolltech.gif");
++ movie=new QMovie("/usr/X11R6/share/xlines/trolltech.gif");
label=new QLabel(this,"label");
label->setFrameStyle(QFrame::Box|QFrame::Plain);
label->setMovie(*movie);
+@@ -523,7 +523,7 @@
+ {
+ }
+
+-void main(int argc,char *argv[])
++int main(int argc,char *argv[])
+ {
+ QApplication app(argc,argv);
+