Attachment 83420 Details for Bug 119160 – file.diff

[patch] file.diff

file.diff (text/plain), 4.42 KB, created by tkato432 on 2007-12-30 18:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2007-12-30 18:10:00 UTC

Size: 4.42 KB

patch

obsolete

>diff -urN /usr/ports/astro/xtide/Makefile astro/xtide/Makefile
>--- /usr/ports/astro/xtide/Makefile	Thu Sep 13 16:05:57 2007
>+++ astro/xtide/Makefile	Sun Dec 23 01:03:43 2007
>@@ -6,14 +6,14 @@
> #
> 
> PORTNAME=	xtide
>-PORTVERSION=	2.9.4
>+PORTVERSION=	2.9.5
> CATEGORIES=	astro geography
> MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>-		libtcd-2.2.2.tar.bz2 \
>-		harmonics-dwf-20070318.tcd.bz2
>+		libtcd-2.2.3.tar.bz2 \
>+		harmonics-dwf-20071122-free.tcd.bz2
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
>-		libtcd-2.2.2.tar.bz2
>+		libtcd-2.2.3.tar.bz2
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Harmonic tide clock and tide predictor
>@@ -21,10 +21,10 @@
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
> 
> USE_BZIP2=	yes
>-USE_XLIB=	yes
>+USE_XORG=	xpm
>+USE_GNOME=	gnometarget
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> 
> MAN1=		tide.1 xtide.1
>@@ -32,24 +32,24 @@
> PLIST_FILES=	bin/tide bin/xtide bin/xttpd %%DATADIR%%/harmonics.tcd
> PLIST_DIRS=	%%DATADIR%%
> 
>-CPPFLAGS=	-I../libtcd-2.2.2 -I${LOCALBASE}/include/libpng
>-LDFLAGS=	-L../libtcd-2.2.2/.libs -L${LOCALBASE}/lib
>+CPPFLAGS=	-I../libtcd-2.2.3 -I${LOCALBASE}/include/libpng
>+LDFLAGS=	-L../libtcd-2.2.3/.libs -L${LOCALBASE}/lib
> 
> .include <bsd.port.pre.mk>
> 
> post-extract:
>-	@${BZCAT} ${DISTDIR}/harmonics-dwf-20070318.tcd.bz2 \
>+	@${BZCAT} ${DISTDIR}/harmonics-dwf-20071122-free.tcd.bz2 \
> 		> ${WRKSRC}/harmonics.tcd
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|== yes|= yes|g' ${WRKDIR}/libtcd-2.2.2/configure
>+	@${REINPLACE_CMD} -e 's|== yes|= yes|g' ${WRKDIR}/libtcd-2.2.3/configure
> 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
> .for file in Global.cc HarmonicsPath.cc wvsrtv.cc
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${file}
> .endfor
> 
> pre-configure:
>-	@cd ${WRKDIR}/libtcd-2.2.2 \
>+	@cd ${WRKDIR}/libtcd-2.2.3 \
> 		&& ${SETENV} ${MAKE_ENV} ${SH} ./configure --disable-shared \
> 		&& ${MAKE}
> 
>diff -urN /usr/ports/astro/xtide/distinfo astro/xtide/distinfo
>--- /usr/ports/astro/xtide/distinfo	Thu Sep 13 16:05:57 2007
>+++ astro/xtide/distinfo	Sun Dec 23 00:40:14 2007
>@@ -1,9 +1,9 @@
>-MD5 (xtide-2.9.4.tar.bz2) = e87667669df1755579bca7085aef1580
>-SHA256 (xtide-2.9.4.tar.bz2) = 6c2997cc3e5200c88e410965bb3f2279c16d7ab279c4fe3037af81284a31efa0
>-SIZE (xtide-2.9.4.tar.bz2) = 386447
>-MD5 (libtcd-2.2.2.tar.bz2) = 4780aa7c88d6816e6b4d2a744859d1e7
>-SHA256 (libtcd-2.2.2.tar.bz2) = f6647891c9c093302da68cb9b8045cd38064973a25067effa74ff0cde8f44e12
>-SIZE (libtcd-2.2.2.tar.bz2) = 264619
>-MD5 (harmonics-dwf-20070318.tcd.bz2) = cb00b5ba54c388ee4927a1b990f9220d
>-SHA256 (harmonics-dwf-20070318.tcd.bz2) = ae268904c20888c1097f3fc577dffbba15634a1a48b6f7195a4ca33a7ccb914b
>-SIZE (harmonics-dwf-20070318.tcd.bz2) = 487099
>+MD5 (xtide-2.9.5.tar.bz2) = e78f229522bdaff0dbef132874b9d9f5
>+SHA256 (xtide-2.9.5.tar.bz2) = 5a279089ca9e971d8cda79f3bcbfa195fe73fa24ac202a1229f6c3c7aa79cddb
>+SIZE (xtide-2.9.5.tar.bz2) = 391876
>+MD5 (libtcd-2.2.3.tar.bz2) = 26d06f6f12371fac48b679af37aa94ec
>+SHA256 (libtcd-2.2.3.tar.bz2) = be356f4dafb51cd8afedfa5d8a08eb55b06f3b29b158052c88625da11b32c6d8
>+SIZE (libtcd-2.2.3.tar.bz2) = 249846
>+MD5 (harmonics-dwf-20071122-free.tcd.bz2) = c86b949b347a948a8f0c3a494ebe10ae
>+SHA256 (harmonics-dwf-20071122-free.tcd.bz2) = dd33485783f737fa5635c6115cbf4476e758ec135e929ccc1d77c11e176bfdd5
>+SIZE (harmonics-dwf-20071122-free.tcd.bz2) = 397668
>diff -urN /usr/ports/astro/xtide/files/patch-HarmonicsPath.cc astro/xtide/files/patch-HarmonicsPath.cc
>--- /usr/ports/astro/xtide/files/patch-HarmonicsPath.cc	Mon Mar 26 20:25:55 2007
>+++ astro/xtide/files/patch-HarmonicsPath.cc	Sun Dec 23 00:41:34 2007
>@@ -1,11 +1,11 @@
>---- HarmonicsPath.cc.orig	Mon Feb 26 07:51:38 2007
>-+++ HarmonicsPath.cc	Fri Mar 23 02:32:10 2007
>-@@ -30,7 +30,7 @@
>-   Dstr hfile_path (getenv ("HFILE_PATH"));
>-   if (hfile_path.isNull()) {
>-     FILE *configfile;
>--    if ((configfile = fopen ("/etc/xtide.conf", "r"))) {
>-+    if ((configfile = fopen ("%%PREFIX%%/etc/xtide.conf", "r"))) {
>-       hfile_path.getline (configfile);
>-       fclose (configfile);
>-     }
>+--- HarmonicsPath.cc.orig	Fri Dec  7 08:13:13 2007
>++++ HarmonicsPath.cc	Sun Dec 23 00:41:28 2007
>+@@ -31,7 +31,7 @@
>+ #ifdef UseLocalFiles
>+ static const char confFile[] = "xtide.conf";
>+ #else
>+-static const char confFile[] = "/etc/xtide.conf";
>++static const char confFile[] = "%%PREFIX%%/etc/xtide.conf";
>+ #endif
>+ 
>+

Actions: View | Diff

Attachments on bug 119160: 83420