mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Update WWW.

Browse Source 
Use qt3 instead of qt1
Fix Build on CURRENT

Approved by:	kris (maintainer)
This commit is contained in:
Tilman Keskinoz 2003-01-25 22:29:56 +00:00
parent 7b98df9f62
commit 9a739d2a13
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=74003
6 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
astro/xglobe/Makefile
View File

@ -7,14 +7,16 @@
PORTNAME= xglobe
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= http://www.uni-karlsruhe.de/~uddn/xglobe/
MASTER_SITES= http://www.cs.unc.edu/~scheuerm/xglobe/
MAINTAINER= kris@FreeBSD.org
USE_QT_VER= 1
USE_QT_VER= 3
USE_X_PREFIX= yes
USE_GMAKE= yes
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
do-install:
@${MKDIR} ${PREFIX}/share/xglobe/

11
astro/xglobe/files/patch-aa
View File

@ -1,5 +1,5 @@
--- Makefile.orig Mon Jul 19 05:56:27 1999
+++ Makefile Sun May 5 01:53:17 2002
--- Makefile.orig Mon Jul 19 14:56:27 1999
+++ Makefile Sat Jan 25 14:51:03 2003
@@ -4,29 +4,30 @@
####### Installation directory
@ -15,7 +15,7 @@
-X11_INCLUDE_DIR = /usr/X11R6/include
-QT_INCLUDE_DIR = $(QTDIR)/include
+X11_INCLUDE_DIR = $(X11BASE)/include
+QT_INCLUDE_DIR = $(X11BASE)/include/X11/qt1
+QT_INCLUDE_DIR = $(X11BASE)/include/
-QT_LIB_DIR = $(QTDIR)/lib
-X11_LIB_DIR = /usr/X11R6/lib
@ -27,11 +27,10 @@
-CPP = g++
-LINK = g++
-MOC = moc
+CXX ?= c++
+CPP = ${CXX}
+LINK = ${CXX}
+MOC = moc1
MOC = moc
INSTALL = install
####### compile and link options
@ -46,7 +45,7 @@
LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
-LIBS = -lX11 -lqt -lm
+LIBS = -lX11 -lqt1 -lm
+LIBS = -lX11 -lqt-mt -lm ${PTHREAD_LIBS}
# If you want to use the QImageIO lib (to support jpg and png maps) use the
# next two lines and comment the one above
#WITH_QIMGIO = -DWITH_QIMAGEIO

10
astro/xglobe/files/patch-desktopwidget.cpp Normal file
View File

@ -0,0 +1,10 @@
--- desktopwidget.cpp.orig Sun Jan 26 09:35:35 2003
+++ desktopwidget.cpp Sun Jan 26 09:38:52 2003
@@ -18,6 +18,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include "desktopwidget.h"
DesktopWidget::DesktopWidget(QWidget *parent, const char *name)

15
astro/xglobe/files/patch-random
View File

@ -11,21 +11,6 @@
}
/* ------------------------------------------------------------------------*/
--- renderer.cpp.orig Sat Feb 24 10:12:53 2001
+++ renderer.cpp Sat Feb 24 10:13:04 2001
@@ -1562,9 +1562,9 @@
for(int i=0; i<numstars; i++)
{
- x = rand() % renderedImage->width();
- y = rand() % renderedImage->height();
- brightness = 150+ (rand() % 106);
+ x = random() % renderedImage->width();
+ y = random() % renderedImage->height();
+ brightness = 150+ (random() % 106);
p = (unsigned int *)renderedImage->scanLine(y);
p += x;
*p = qRgb(brightness, brightness, brightness);
--- main.cpp.orig Tue Jul 13 10:32:55 1999
+++ main.cpp Sat Feb 24 10:14:56 2001
@@ -24,6 +24,7 @@

26
astro/xglobe/files/patch-renderer.cpp Normal file
View File

@ -0,0 +1,26 @@
--- renderer.cpp.orig Mon Dec 6 17:13:35 1999
+++ renderer.cpp Sun Jan 26 09:32:22 2003
@@ -1483,8 +1483,8 @@
labelstring.sprintf("%s, %s %d. %d, %d:%02d %s\n"
"View pos %2.2f° %c %2.2f° %c\n"
"Sun pos %2.2f° %c %2.2f° %c",
- dt.date().dayName(dt.date().dayOfWeek()),
- dt.date().monthName(dt.date().month()),
+ dt.date().dayName(dt.date().dayOfWeek()).latin1(),
+ dt.date().monthName(dt.date().month()).latin1(),
dt.date().day(), dt.date().year(),
dt.time().hour(), dt.time().minute(),
tzname[tm->tm_isdst],
@@ -1562,9 +1562,9 @@
for(int i=0; i<numstars; i++)
{
- x = rand() % renderedImage->width();
- y = rand() % renderedImage->height();
- brightness = 150+ (rand() % 106);
+ x = random() % renderedImage->width();
+ y = random() % renderedImage->height();
+ brightness = 150+ (random() % 106);
p = (unsigned int *)renderedImage->scanLine(y);
p += x;
*p = qRgb(brightness, brightness, brightness);

2
astro/xglobe/pkg-descr
View File

@ -2,4 +2,4 @@ Displays a rendered view of the earth in your root window, similar to
xearth, but instead uses a satellite image map of the earth. You can also
substitute surface maps of other planets if you're feeling cosmic.
WWW: http://www.stud.uni-karlsruhe.de/~uddn/xglobe/
WWW: http://www.cs.unc.edu/~scheuerm/xglobe/