diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /astro | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'astro')
27 files changed, 57 insertions, 61 deletions
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index 693cda07c1ce..0d726cc3f30b 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -7,10 +7,9 @@ PORTNAME= celestia PORTVERSION= 1.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= celestia +MASTER_SITES= SF PKGNAMESUFFIX= -${CELESTIA_UI} MAINTAINER= jylefort@FreeBSD.org @@ -21,14 +20,14 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_GL= yes +USE_GL= gl USE_GETTEXT= yes WANT_GNOME= yes CONFIGURE_ARGS= --program-prefix="" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${X11BASE}/lib -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} UI_LIST= glut gtk gnome CELESTIA_UI?= glut diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile index ab1647318365..d5ff16d42185 100644 --- a/astro/gaia/Makefile +++ b/astro/gaia/Makefile @@ -9,7 +9,7 @@ PORTNAME= gaia PORTVERSION= 0.1.2 PORTREVISION= 3 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gaia-clean MAINTAINER= se@FreeBSD.org @@ -41,7 +41,7 @@ PORTDOCS= README post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/SConstruct + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/SConstruct .if !defined(NOPORTDOCS) post-install: diff --git a/astro/gkrellmoon/Makefile b/astro/gkrellmoon/Makefile index b14b679bce49..9dea449882b5 100644 --- a/astro/gkrellmoon/Makefile +++ b/astro/gkrellmoon/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A moon clock plugin for Gkrellm -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm USE_GNOME= imlib diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile index 05ab4a7c962c..879fc5ea7d4a 100644 --- a/astro/gkrellmoon2/Makefile +++ b/astro/gkrellmoon2/Makefile @@ -9,14 +9,14 @@ PORTNAME= gkrellmoon2 PORTVERSION= 0.6 PORTREVISION= 4 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gkrellmoon DISTNAME= gkrellmoon-${PORTVERSION} MAINTAINER= w@wrzask.pl COMMENT= A moon clock plugin for Gkrellm2 -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_GNOME= gtk20 diff --git a/astro/gkrellsun/Makefile b/astro/gkrellsun/Makefile index ae9708ea6aea..90eb26dbfe0b 100644 --- a/astro/gkrellsun/Makefile +++ b/astro/gkrellsun/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://nwalsh.com/hacks/gkrellsun/ MAINTAINER= ports@FreeBSD.org COMMENT= A Gkrellm-Plugin that displays the local sun rise and sun set times -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} diff --git a/astro/jday/Makefile b/astro/jday/Makefile index 869b029605a0..ffa9aa85438a 100644 --- a/astro/jday/Makefile +++ b/astro/jday/Makefile @@ -15,7 +15,7 @@ COMMENT= Astronomical julian date calculator USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index bb1e6a67a066..74a482dc303d 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -9,8 +9,7 @@ PORTNAME= openuniverse DISTVERSION= 1.0beta3 PORTREVISION= 4 CATEGORIES= astro -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= openuniverse +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL Solar System simulator for X Window System @@ -26,8 +25,8 @@ USE_GMAKE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" \ -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/GL -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/GL -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lm" \ LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}" MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/astro/saoimage/files/patch-aa b/astro/saoimage/files/patch-aa index 5cf2b36a7dd2..d897bf4e5ea1 100644 --- a/astro/saoimage/files/patch-aa +++ b/astro/saoimage/files/patch-aa @@ -33,7 +33,7 @@ #ADFLAGS = -I/usr/openwin/share/include # ATTENTION: OpenWindows users... -ADFLAGS = -I/usr/X11R6/include -+ADFLAGS = -I${X11BASE}/include ++ADFLAGS = -I${LOCALBASE}/include # Libraries that move about or may require special specification. # @@ -42,7 +42,7 @@ # to specify its path fully in XLIB. -XLIB = -L/usr/X11R6/lib -lX11 -+XLIB = -L${X11BASE}/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 #XLIB = -L/usr/X11R6/lib -lX11 # ATTENTION: OpenWindows users... #F77LIB = -lF77 -lI77 -lU77 F77LIB = -lf2c @@ -51,7 +51,7 @@ -XLIBH = /usr/X11R6/include/X11/Xlib.h /usr/X11R6/include/X11/Xutil.h -+XLIBH = ${X11BASE}/include/X11/Xlib.h ${X11BASE}/include/X11/Xutil.h ++XLIBH = ${LOCALBASE}/include/X11/Xlib.h ${LOCALBASE}/include/X11/Xutil.h STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \ hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH) @@ -61,8 +61,8 @@ defs/desktop.def defs/cursor.def -mainkey.o : $(WORKS) /usr/include/X11/keysym.h \ - /usr/include/X11/keysymdef.h -+mainkey.o : $(WORKS) ${X11BASE}/include/X11/keysym.h \ -+ ${X11BASE}/include/X11/keysymdef.h ++mainkey.o : $(WORKS) ${LOCALBASE}/include/X11/keysym.h \ ++ ${LOCALBASE}/include/X11/keysymdef.h #mainkey.o : $(WORKS) # for OpenWindows mainslct.o : $(WORKS) mainutil.o : $(XLIBH) $(STRUCT) hfiles/extern.h diff --git a/astro/saoimage/files/patch-ab b/astro/saoimage/files/patch-ab index a2e953f0882b..a556ab3fe672 100644 --- a/astro/saoimage/files/patch-ab +++ b/astro/saoimage/files/patch-ab @@ -5,7 +5,7 @@ # make procedure in the parent SAOimage directory. -CFLAGS = -c -O -+CFLAGS += -c -I${X11BASE}/include ++CFLAGS += -c -I${LOCALBASE}/include LINT = lint RANLIB = ranlib @@ -14,7 +14,7 @@ LIB = libbtn.a -XLIBH = /usr/include/X11/Xlib.h -+XLIBH = ${X11BASE}/include/X11/Xlib.h ++XLIBH = ${LOCALBASE}/include/X11/Xlib.h #XLIBH = /usr/openwin/share/include/X11/Xlib.h #for OpenWindows all: $(LIB) diff --git a/astro/sattrack/files/patch-aa b/astro/sattrack/files/patch-aa index 66ad920df4fd..29d66f9210be 100644 --- a/astro/sattrack/files/patch-aa +++ b/astro/sattrack/files/patch-aa @@ -223,7 +223,7 @@ #LX11 = -L/usr/openwin/lib -lX11 -lXt #LX11 = -lX11 -lXt -lICE -lSM # X11R6 -+ LX11 = -L$(X11BASE)/lib -lX11 -lXt -lICE -lSM ++ LX11 = -L$(LOCALBASE)/lib -lX11 -lXt -lICE -lSM #LX11 = -L/usr/openwin/lib -lX11 -lXt -lICE -lSM #CC_CXINC = diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile index a964b6c2d69f..81d8d749710c 100644 --- a/astro/sunclock/Makefile +++ b/astro/sunclock/Makefile @@ -20,10 +20,10 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include MAN1= sunclock.1 diff --git a/astro/sunclock/files/patch-Imakefile b/astro/sunclock/files/patch-Imakefile index 894fa1bb12a1..41a15e7fa378 100644 --- a/astro/sunclock/files/patch-Imakefile +++ b/astro/sunclock/files/patch-Imakefile @@ -34,12 +34,12 @@ -#JINC=-I/usr/include - -CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -+XPMLIBDIR=-L${X11BASE}/lib -+XPMINC=-I${X11BASE}/include/X11 ++XPMLIBDIR=-L${LOCALBASE}/lib ++XPMINC=-I${LOCALBASE}/include/X11 +JLIBDIR=-L${LOCALBASE}/lib +ZLIBDIR=-L${LOCALBASE}/lib +JINC=-I${LOCALBASE}/include -+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -I${X11BASE}/include -L${LOCALBASE}/lib -L${X11BASE}/lib ++CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -L${LOCALBASE}/lib #endif SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \ diff --git a/astro/sunclock/files/patch-editkit_Imakefile b/astro/sunclock/files/patch-editkit_Imakefile index 00d1538a8f78..a73976658268 100644 --- a/astro/sunclock/files/patch-editkit_Imakefile +++ b/astro/sunclock/files/patch-editkit_Imakefile @@ -5,7 +5,7 @@ XCOMM -CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -I${X11BASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib ++COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -L${LOCALBASE}/lib + +CCOPTIONS=${COPTS} diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile index 3f13915e5f40..ba1568addcb7 100644 --- a/astro/tkgeomap/Makefile +++ b/astro/tkgeomap/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= tclgeomap.0:${PORTSDIR}/astro/tclgeomap CONFIGURE_ARGS= --with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \ --with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \ --with-tk=${TK_LIBDIR} --with-tkinclude=${TK_INCLUDEDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include CONFIGURE_ENV= TCLGEOMAP_LIB=${LOCALBASE}/lib/tclgeomap USE_TK= 82+ GNU_CONFIGURE= yes diff --git a/astro/wmjupiter/files/patch-Makefile b/astro/wmjupiter/files/patch-Makefile index 114129bd213a..0a1ea2fabf23 100644 --- a/astro/wmjupiter/files/patch-Makefile +++ b/astro/wmjupiter/files/patch-Makefile @@ -4,10 +4,10 @@ -CC = gcc -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext -lm # for Solaris diff --git a/astro/wmmoonclock/files/patch-aa b/astro/wmmoonclock/files/patch-aa index 9e91c105807c..82c272ebcf27 100644 --- a/astro/wmmoonclock/files/patch-aa +++ b/astro/wmmoonclock/files/patch-aa @@ -13,9 +13,9 @@ --- 1,8 ---- ! CC ?= gcc ! CFLAGS ?= -O2 -! INCDIR = -I${X11BASE}/include +! INCDIR = -I${LOCALBASE}/include ! DESTDIR= ${PREFIX} -! LIBDIR = -L${X11BASE}/lib +! LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext diff --git a/astro/wmsolar/files/patch-Makefile b/astro/wmsolar/files/patch-Makefile index 42b43d010258..504e2575acda 100644 --- a/astro/wmsolar/files/patch-Makefile +++ b/astro/wmsolar/files/patch-Makefile @@ -4,10 +4,10 @@ -CC = g++ -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext -lm # for Solaris diff --git a/astro/wmspaceweather/files/patch-aa b/astro/wmspaceweather/files/patch-aa index 6074c5940ce6..410bf193920c 100644 --- a/astro/wmspaceweather/files/patch-aa +++ b/astro/wmspaceweather/files/patch-aa @@ -8,9 +8,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext # for Solaris diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile index 09e6722ca206..1d1bebc66986 100644 --- a/astro/wmsun/Makefile +++ b/astro/wmsun/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/wmSun USE_XORG= xext xpm x11 ALL_TARGET= clean all MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ - INCDIR="-I${X11BASE}/include" LIBDIR="-L${X11BASE}/lib" + INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib" MAN1= wmSun.1 PLIST_FILES= bin/wmSun diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index ca3d9dad3d29..f05007b4bfa5 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -7,6 +7,7 @@ PORTNAME= xephem PORTVERSION= 3.7.3 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ @@ -17,7 +18,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_MOTIF= yes -USE_X_PREFIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem diff --git a/astro/xglobe/files/patch-aa b/astro/xglobe/files/patch-aa index bfba5b89df9f..38d72353b486 100644 --- a/astro/xglobe/files/patch-aa +++ b/astro/xglobe/files/patch-aa @@ -14,13 +14,13 @@ -X11_INCLUDE_DIR = /usr/X11R6/include -QT_INCLUDE_DIR = $(QTDIR)/include -+X11_INCLUDE_DIR = $(X11BASE)/include ++X11_INCLUDE_DIR = $(LOCALBASE)/include +QT_INCLUDE_DIR = $(QT_PREFIX)/include/ -QT_LIB_DIR = $(QTDIR)/lib -X11_LIB_DIR = /usr/X11R6/lib +QT_LIB_DIR = $(QT_PREFIX)/lib -+X11_LIB_DIR = $(X11BASE)/lib ++X11_LIB_DIR = $(LOCALBASE)/lib ####### Compiler and tools diff --git a/astro/xmoontool/files/patch-Makefile b/astro/xmoontool/files/patch-Makefile index df09066bdc47..449c93758ef8 100644 --- a/astro/xmoontool/files/patch-Makefile +++ b/astro/xmoontool/files/patch-Makefile @@ -11,5 +11,5 @@ +#CFLAGS= -O2 -Wall +LDFLAGS+= -lXm -lXt -lX11 -lm DEFINES?= -DDEFAULT_COLOR - ALL_CFLAGS= $(CFLAGS) $(DEFINES) -I$(X11BASE)/include -L$(X11BASE)/lib + ALL_CFLAGS= $(CFLAGS) $(DEFINES) -I$(LOCALBASE)/include -L$(LOCALBASE)/lib diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index 82f7796a93d2..4b3957f40341 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -7,20 +7,19 @@ PORTNAME= xplanet PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro geography -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= novel@FreeBSD.org COMMENT= Draw pictures of the earth textured by an image -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= xt xscrnsaver USE_GNOME= # CONFIGURE_ARGS= --with-map-extension=jpg -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lm" OPTIONS= FREETYPE "Enable Freetype support" on \ PANGO "Enable PANGO support" on \ diff --git a/astro/xrmap/Makefile b/astro/xrmap/Makefile index 0c67ff9f39c0..662e059d83ff 100644 --- a/astro/xrmap/Makefile +++ b/astro/xrmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrmap PORTVERSION= 2.33 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \ ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src @@ -24,8 +24,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_BZIP2= yes USE_IMAKE= yes MANCOMPRESSED= no -USE_XPM= yes -USE_XLIB= yes +USE_XORG= xpm CIAFILE= CIA_WDB2.jpd.bz2 POPFILE= population.dat.bz2 diff --git a/astro/xrmap/files/patch-earthview_Makefile b/astro/xrmap/files/patch-earthview_Makefile index 95b04ad0d0ab..672d4ead074f 100644 --- a/astro/xrmap/files/patch-earthview_Makefile +++ b/astro/xrmap/files/patch-earthview_Makefile @@ -5,7 +5,7 @@ earthview: earthview.c - gcc -Wall -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -L/usr/X11R6/lib -lX11 -lm -lz -lbz2 -+ $(CC) $(CFLAGS) -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -I$(X11BASE)/include -L$(X11BASE)/lib -lX11 -lm -lz -lbz2 ++ $(CC) $(CFLAGS) -DDATADIR=\"$(DATADIR)\" earthview.c -o earthview -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lX11 -lm -lz -lbz2 install: install -c -s earthview $(BINDIR) diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index 7a6ef1c9bf80..94929245301b 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -7,6 +7,7 @@ PORTNAME= xtide PORTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.flaterco.com/xtide/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -21,9 +22,8 @@ COMMENT= Harmonic tide clock and tide predictor LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes -USE_XORG= xpm +USE_XORG= xpm xaw USE_GNOME= gnometarget -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -44,7 +44,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|== yes|= yes|g' ${WRKDIR}/libtcd-2.2.3/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure .for file in Global.cc HarmonicsPath.cc wvsrtv.cc @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${file} .endfor diff --git a/astro/xworld/Makefile b/astro/xworld/Makefile index b591e904b21d..b22cfe4beb34 100644 --- a/astro/xworld/Makefile +++ b/astro/xworld/Makefile @@ -20,8 +20,8 @@ USE_XORG= x11 HAS_CONFIGURE= yes CONFIGURE_ENV= CAT=${CAT} \ STRIP=/usr/bin/strip \ - INCLUDES="-I${X11BASE}/include" \ - LDLIBS="-lm -L${X11BASE}/lib -lX11" \ + INCLUDES="-I${LOCALBASE}/include" \ + LDLIBS="-lm -L${LOCALBASE}/lib -lX11" \ MORELIBS="" PLIST_FILES= bin/xworld STRIP= #don't strip out image data on install |