diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2015-09-14 14:53:22 +0000 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2015-09-14 14:53:22 +0000 |
| commit | 0598e187c29702353c18c68480389329ba30006f (patch) | |
| tree | b07a3b87a24099cb4ffefdfa039aa786bb26ac09 | |
| parent | 0fc656103805a4104d156f284331a5553742ca3c (diff) | |
| download | FreeBSD-ports-0598e187c29702353c18c68480389329ba30006f.zip FreeBSD-ports-0598e187c29702353c18c68480389329ba30006f.tar.gz | |
Update to 3.7.7
Sponsored by: iXsystems
| -rw-r--r-- | astro/xephem/Makefile | 3 | ||||
| -rw-r--r-- | astro/xephem/distinfo | 4 | ||||
| -rw-r--r-- | astro/xephem/files/patch-Makefile | 37 |
3 files changed, 16 insertions, 28 deletions
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index 5d521cd..7719228 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xephem -PORTVERSION= 3.7.6 -PORTREVISION= 2 +PORTVERSION= 3.7.7 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ diff --git a/astro/xephem/distinfo b/astro/xephem/distinfo index a7853b8..44aefea 100644 --- a/astro/xephem/distinfo +++ b/astro/xephem/distinfo @@ -1,2 +1,2 @@ -SHA256 (xephem-3.7.6.tar.gz) = 2080b628d80d52d9ff7148787e3093eb56f21fef5fba404f123b6198b2d64d05 -SIZE (xephem-3.7.6.tar.gz) = 17975496 +SHA256 (xephem-3.7.7.tar.gz) = 8bee7ed8361e0e11a386ef4f05101e60bdb607e09a9823eec6ed20edbd230376 +SIZE (xephem-3.7.7.tar.gz) = 38010880 diff --git a/astro/xephem/files/patch-Makefile b/astro/xephem/files/patch-Makefile index 7e89765..eb38638 100644 --- a/astro/xephem/files/patch-Makefile +++ b/astro/xephem/files/patch-Makefile @@ -1,44 +1,30 @@ ---- Makefile.orig 2013-01-20 04:42:02.000000000 +0100 -+++ Makefile 2013-10-20 13:58:27.000000000 +0200 -@@ -10,9 +10,9 @@ - # one executable, xephem. - - # These -I and -L flags point to the supporting XEphem libraries --LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz --LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz --LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz -+LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I%%LOCALBASE%%/include -+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L%%LOCALBASE%%/lib -+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz - - # MOTIFI is the directory containing the Xm directory of include files. - # MOTIFL is the directory containing the libXm.a library. -@@ -24,19 +24,19 @@ +--- Makefile.orig 2015-09-14 09:37:09.737810488 -0500 ++++ Makefile 2015-09-14 09:45:54.470774555 -0500 +@@ -23,18 +23,18 @@ MOTIFL = $(MOTIF) endif ifndef MOTIFI --MOTIFI = /usr/X11R6/include +-MOTIFI = /usr/include +MOTIFI = %%LOCALBASE%%/include endif ifndef MOTIFL --MOTIFL = /usr/X11R6/lib -+MOTIFL = %%LOCALBASE%%/lib +-MOTIFL = /usr/lib ++MOTIFL = %%/LOCALBASE%%/lib endif # for linux and Apple OS X - # some systems now use just /usr/X11 (not /usr/X11R6) CC = gcc 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/opt/X11/include +-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib -XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11 +CFLAGS = $(LIBINC) $(CLDFLAGS) -Wall -I$(MOTIFI) -I%%LOCALBASE%%/include +LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L%%LOCALBASE%%/lib +XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11 -lXft LIBS = $(XLIBS) $(LIBLIB) -lm - # for ppc Apple OS X to make universal (i386 and ppc binary), requires -@@ -181,18 +181,15 @@ + # static linking on Apple using X11 libs from ports +@@ -189,18 +189,18 @@ all: libs xephem xephem.1 xephem: $(INCS) $(OBJS) @@ -57,7 +43,10 @@ - cd ../../libz; make + cd ../../libastro; $(MAKE) + cd ../../libip; $(MAKE) ++ cd ../../libjpegd; $(MAKE) + cd ../../liblilxml; $(MAKE) ++ cd ../../libpng; $(MAKE) ++ cd ../../libz; $(MAKE) clean: rm -fr *.o ../../lib*/*.[ao] |
