Index: head/astro/xephem/Makefile =================================================================== --- head/astro/xephem/Makefile (revision 238471) +++ head/astro/xephem/Makefile (revision 238472) @@ -1,70 +1,69 @@ # New ports collection makefile for: xephem # Date created: Thu Aug 1 09:10:22 CDT 1996 # Whom: erich@FreeBSD.org # # $FreeBSD$ # PORTNAME= xephem -PORTVERSION= 3.7.3 -PORTREVISION= 2 +PORTVERSION= 3.7.4 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ MAINTAINER= jpaetzel@FreeBSD.org COMMENT= An interactive astronomical ephemeris program LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.10:${PORTSDIR}/graphics/jpeg USE_MOTIF= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem MAN1= xephem.1 RESTRICTED= Personal use only # XXX needs to be the same as DISTFILES XEPHEMSRC= ${PORTNAME}-${PORTVERSION}.tar.gz .include .for file in ${XEPHEMSRC} .if !exists(${DISTDIR}/${file}) && !defined(PACKAGE_BUILDING) ECHO_MSG= ${PRINTF} IGNORE=:\n\ Because of licensing restrictions, you must manually fetch\n\ ${file} from http://www.clearskyinstitute.com/xephem/,\n\ place it in ${DISTDIR} and then run make again.\n .endif .endfor post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|/usr/X11R6|${X11BASE}|g' \ ${WRKSRC}/Makefile @${FIND} ${WRKSRC}/../.. -name Makefile -type f | \ ${XARGS} ${REINPLACE_CMD} -e 's|CC =|CC?=|g ; \ s|CFLAGS=|CFLAGS+=|g ; \ s|-O2 ||g' pre-build: @${ECHO_CMD} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' > ${WRKSRC}/XEphem.ad pre-install: @${FIND} ${WRKSRC}/../.. -name Makefile.bak -type f | ${XARGS} ${RM} -f @${CP} ${WRKSRC}/xephem.man ${WRKSRC}/xephem.1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xephem ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xephem.1 ${MANPREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${PREFIX}/lib/X11/app-defaults/XEphem @${MKDIR} ${PREFIX}/lib/X11/xephem ${TAR} -C ${WRKSRC} -cf - auxil catalogs fifos fits gallery help lo tools \ | ${TAR} -C ${PREFIX}/lib/X11/xephem --unlink -xf - @${FIND} ${PREFIX}/lib/X11/xephem | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGROUP} @${FIND} ${PREFIX}/lib/X11/xephem -type f | ${XARGS} ${CHMOD} ${SHAREMODE} .include Property changes on: head/astro/xephem/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.54 \ No newline at end of property +1.55 \ No newline at end of property Index: head/astro/xephem/distinfo =================================================================== --- head/astro/xephem/distinfo (revision 238471) +++ head/astro/xephem/distinfo (revision 238472) @@ -1,3 +1,3 @@ -MD5 (xephem-3.7.3.tar.gz) = aa2330dad58403020cde12b5d228e499 -SHA256 (xephem-3.7.3.tar.gz) = 450fa05a36ce4c8ceca80bd5a003c060bc4d9e07719aebcb13565b563b90e337 -SIZE (xephem-3.7.3.tar.gz) = 22148450 +MD5 (xephem-3.7.4.tar.gz) = 4e9290609f36df469a2ba5a1b4fffd46 +SHA256 (xephem-3.7.4.tar.gz) = 423b044d4a6433c62e493b891a7eb8aa332bc86d113069347945e4331d322726 +SIZE (xephem-3.7.4.tar.gz) = 22154575 Property changes on: head/astro/xephem/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/astro/xephem/files/patch-Makefile =================================================================== --- head/astro/xephem/files/patch-Makefile (revision 238471) +++ head/astro/xephem/files/patch-Makefile (revision 238472) @@ -1,35 +1,49 @@ ---- Makefile.orig Fri Nov 18 16:43:09 2005 -+++ Makefile Mon Dec 5 12:58:21 2005 +--- Makefile.orig 2009-07-26 16:36:37.000000000 +0000 ++++ Makefile 2009-07-26 16:39:34.000000000 +0000 @@ -10,9 +10,9 @@ - # back here and compile and link all the *.c files into one executable, xephem. + # one executable, xephem. - # -I and -L flags to find required supporting XEphem libraries + # 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. -@@ -31,7 +31,7 @@ +@@ -24,18 +24,18 @@ + MOTIFL = $(MOTIF) + endif + ifndef MOTIFI +-MOTIFI = /usr/X11R6/include ++MOTIFI = %%LOCALBASE%%/include + endif + ifndef MOTIFL +-MOTIFL = /usr/X11R6/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 -+#CLDFLAGS = -g - CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include - LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib - XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lSM -lICE -lXmu -lX11 -@@ -181,10 +181,7 @@ + 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 ++LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L%%LOCALBASE%%/lib + XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 + LIBS = $(XLIBS) $(LIBLIB) -lm + +@@ -189,10 +189,7 @@ libs: cd ../../libastro; make cd ../../libip; make - cd ../../libjpegd; make cd ../../liblilxml; make - cd ../../libpng; make - cd ../../libz; make clean: - touch x.o + rm -fr *.o ../../lib*/*.[ao] Property changes on: head/astro/xephem/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property