diff options
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/xglobe/Makefile | 4 | ||||
| -rw-r--r-- | astro/xglobe/distinfo | 2 | ||||
| -rw-r--r-- | astro/xglobe/files/patch-aa | 24 |
3 files changed, 15 insertions, 15 deletions
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile index 79463789a01a..3ca604847909 100644 --- a/astro/xglobe/Makefile +++ b/astro/xglobe/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: xglobe -# Version required: 0.2 +# Version required: 0.3.1 # Date created: 20 January 1998 # Whom: Kris Kennaway <kris@FreeBSD.ORG> # # $FreeBSD$ # -DISTNAME= xglobe-0.2 +DISTNAME= xglobe-0.3.1 CATEGORIES= astro MASTER_SITES= http://www.uni-karlsruhe.de/~uddn/xglobe/ diff --git a/astro/xglobe/distinfo b/astro/xglobe/distinfo index 097495fd9249..be1334914764 100644 --- a/astro/xglobe/distinfo +++ b/astro/xglobe/distinfo @@ -1 +1 @@ -MD5 (xglobe-0.2.tar.gz) = edd3958237e6eeb20e2720342350bd7b +MD5 (xglobe-0.3.1.tar.gz) = 3a033f3a96bfde5a4b574b059b574fa2 diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index ef51696f33ba..6ed7ce48b2f5 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -1,22 +1,23 @@ ---- Makefile.orig Mon Apr 19 18:51:04 1999 -+++ Makefile Sun May 9 12:57:37 1999 -@@ -4,29 +4,31 @@ +--- Makefile.orig Mon Jul 19 05:56:27 1999 ++++ Makefile Fri Aug 27 16:06:08 1999 +@@ -4,29 +4,30 @@ ####### Installation directory -XGLOBE_DIR = /usr/local +-XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe +XGLOBE_DIR = $(PREFIX) - XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/xglobe ++XGLOBE_LIB_DIR = $(XGLOBE_DIR)/share/xglobe XGLOBE_BIN_DIR = $(XGLOBE_DIR)/bin ####### Library directories - you may need to modify these -X11_INCLUDE_DIR = /usr/X11R6/include --QT_INCLUDE_DIR = /usr/lib/qt/include +-QT_INCLUDE_DIR = $(QTDIR)/include +X11_INCLUDE_DIR = $(X11BASE)/include +QT_INCLUDE_DIR = $(X11BASE)/include/X11/qt --QT_LIB_DIR = /usr/lib/qt/lib +-QT_LIB_DIR = $(QTDIR)/lib -X11_LIB_DIR = /usr/X11R6/lib +QT_LIB_DIR = $(X11BASE)/lib +X11_LIB_DIR = $(X11BASE)/lib @@ -26,17 +27,16 @@ -CPP = g++ -LINK = g++ -+CXX ?= g++ -+CPP = $(CXX) -+LINK = $(CXX) ++CXX ?= c++ ++CPP = ${CXX} ++LINK = ${CXX} MOC = moc INSTALL = install ####### compile and link options --CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -O2 -Wall -+CFLAGS ?= -O2 -+CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -Wall +-CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) -O2 -Wall ++CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" $(WITH_QIMGIO) LFLAGS = |