From 642c8ce78f9f4d399d09b4f0abebb684354f3582 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Mon, 2 May 2011 12:41:44 +0000 Subject: Fix build with open-motif-2.3.3 PR: ports/154044 Submitted by: Mikhail Tsatsenko Exp-runs by: pav --- astro/xephem/Makefile | 2 +- astro/xephem/files/patch-Makefile | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'astro') diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index e058b11b634f..894da9fe7db8 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -7,7 +7,7 @@ PORTNAME= xephem PORTVERSION= 3.7.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ diff --git a/astro/xephem/files/patch-Makefile b/astro/xephem/files/patch-Makefile index 425aabda6e13..5a80202f48c2 100644 --- a/astro/xephem/files/patch-Makefile +++ b/astro/xephem/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-07-26 16:36:37.000000000 +0000 -+++ Makefile 2009-07-26 16:39:34.000000000 +0000 +--- Makefile.orig 2009-01-05 23:55:59.000000000 +0300 ++++ Makefile 2011-04-13 20:07:51.559534154 +0400 @@ -10,9 +10,9 @@ # one executable, xephem. @@ -31,11 +31,13 @@ CLDFLAGS = -g -CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include -LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib -+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include +-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 +-LIBS = $(XLIBS) $(LIBLIB) -lm ++CFLAGS = $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include +LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L%%LOCALBASE%%/lib - XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 - LIBS = $(XLIBS) $(LIBLIB) -lm - ++XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 -lXft ++LIBS = $(XLIBS) $(LIBLIB) -lm -liconv + @@ -189,10 +189,7 @@ libs: cd ../../libastro; make -- cgit v1.2.3