diff options
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/xglobe/Makefile | 6 | ||||
| -rw-r--r-- | astro/xglobe/distinfo | 2 | ||||
| -rw-r--r-- | astro/xglobe/files/patch-aa | 122 |
3 files changed, 46 insertions, 84 deletions
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile index 92c3e71258ee..c069b7270aff 100644 --- a/astro/xglobe/Makefile +++ b/astro/xglobe/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: xglobe # Version required: 0.2 # Date created: 20 January 1998 -# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au> +# Whom: Kris Kennaway <kris@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/01/26 03:51:39 steve Exp $ # DISTNAME= xglobe-0.2 CATEGORIES= astro MASTER_SITES= http://www.uni-karlsruhe.de/~uddn/xglobe/ -MAINTAINER= kkennawa@physics.adelaide.edu.au +MAINTAINER= kris@FreeBSD.ORG USE_QT= yes USE_X_PREFIX= yes diff --git a/astro/xglobe/distinfo b/astro/xglobe/distinfo index ea6793657c1e..097495fd9249 100644 --- a/astro/xglobe/distinfo +++ b/astro/xglobe/distinfo @@ -1 +1 @@ -MD5 (xglobe-0.2.tar.gz) = 182cc6412b9934f20bb82368d59778da +MD5 (xglobe-0.2.tar.gz) = edd3958237e6eeb20e2720342350bd7b diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index e9ed2d66a237..cc58d99650a7 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -1,80 +1,42 @@ -*** Makefile.orig Wed Jan 20 06:02:59 1999 ---- Makefile Wed Jan 20 21:59:45 1999 -*************** -*** 4,40 **** - - ####### Installation directory - -! XGLOBE_DIR = /usr/local -! XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/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_LIB_DIR = /usr/lib/qt/lib - X11_LIB_DIR = /usr/X11R6/lib - - - ####### Compiler and tools - -! CPP = g++ -! LINK = g++ - MOC = moc - INSTALL = install - - ####### compile and link options - -! CFLAGS = $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -O2 -Wall -! - LFLAGS = - - INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) - - LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) - -! #LIBS = -lX11 -lqt -lm - # If you want to use the QImageIO lib (to support jpg and png maps) use this - # line and comment the one above (don't forget to edit config.h as well!) - #LIBS = -lX11 -lqt -lm -lqimgio ---- 4,41 ---- - - ####### Installation directory - -! XGLOBE_DIR = ${PREFIX} -! 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/X11R6/include/X11/qt - -! QT_LIB_DIR = /usr/X11R6/lib - X11_LIB_DIR = /usr/X11R6/lib - - - ####### Compiler and tools - -! CXX ?= g++ -! CPP = ${CXX} -! LINK = ${CXX} - MOC = moc - INSTALL = install - - ####### compile and link options - -! CFLAGS ?= -O2 -pipe -! CFLAGS += $(INCLUDE_DIRS) -DXGLOBE_LIB_DIR=\"$(XGLOBE_LIB_DIR)\" -Wall - LFLAGS = - - INCLUDE_DIRS = -I$(QT_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) - - LIB_DIRS = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR) - -! LIBS = -lX11 -lqt -lm - # If you want to use the QImageIO lib (to support jpg and png maps) use this - # line and comment the one above (don't forget to edit config.h as well!) - #LIBS = -lX11 -lqt -lm -lqimgio +--- Makefile.orig Mon Apr 19 18:51:04 1999 ++++ Makefile Sat May 1 17:17:30 1999 +@@ -4,29 +4,31 @@ + + ####### Installation directory + +-XGLOBE_DIR = /usr/local ++XGLOBE_DIR = $(PREFIX) + XGLOBE_LIB_DIR = $(XGLOBE_DIR)/lib/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 ++X11_INCLUDE_DIR = $(X11BASE)/include ++QT_INCLUDE_DIR = $(X11BASE)/share/include/X11/qt + +-QT_LIB_DIR = /usr/lib/qt/lib +-X11_LIB_DIR = /usr/X11R6/lib ++QT_LIB_DIR = $(X11BASE)/lib ++X11_LIB_DIR = $(X11BASE)/lib + + + ####### Compiler and tools + +-CPP = g++ +-LINK = g++ ++CXX ?= g++ ++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 + + LFLAGS = + |