Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Apr 2006 07:44:37 -0400
From:      Frank Laszlo <laszlof@vonostingroup.com>
To:        Emanuel Haupt <ehaupt@FreeBSD.org>
Cc:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/96061: [PATCH]: astro/jday: Update to version 2.4
Message-ID:  <44477425.1020404@vonostingroup.com>
In-Reply-To: <200604200912.k3K9C33o037581@freefall.freebsd.org>
References:  <200604200912.k3K9C33o037581@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------040407000703050806000601
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Whoops,
    Forgot to handle the libjday.so symbolic link, Here ya go.

-Frank


--------------040407000703050806000601
Content-Type: text/plain;
 name="jday-2.4.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline;
 filename="jday-2.4.diff"

diff -NrU3 jday.orig/Makefile jday/Makefile
--- jday.orig/Makefile	Wed Apr 19 13:20:01 2006
+++ jday/Makefile	Thu Apr 20 07:42:29 2006
@@ -5,17 +5,23 @@
 # $FreeBSD: ports/astro/jday/Makefile,v 1.6 2004/04/17 19:20:30 krion Ex=
p $
=20
 PORTNAME=3D	jday
-PORTVERSION=3D	1.3
+PORTVERSION=3D	2.4
 CATEGORIES=3D	astro
 MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=3D	jday
+MASTER_SITE_SUBDIR=3D	${PORTNAME}
=20
-MAINTAINER=3D	ports@FreeBSD.org
+MAINTAINER=3D	laszlof@vonostingroup.com
 COMMENT=3D	Astronomical julian date calculator
=20
+INSTALLS_SHLIB=3D	yes
 GNU_CONFIGURE=3D	yes
 CONFIGURE_TARGET=3D	--build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
=20
 MAN1=3D	jday.1
+
+PLIST_FILES=3D	bin/jday bin/j2d bin/dbd \
+		include/jday.h lib/libjday.a \
+		lib/libjday.so.2 lib/libjday.la \
+		lib/libjday.so libdata/pkgconfig/jday.pc
=20
 .include <bsd.port.mk>
diff -NrU3 jday.orig/distinfo jday/distinfo
--- jday.orig/distinfo	Wed Apr 19 13:20:01 2006
+++ jday/distinfo	Wed Apr 19 13:20:33 2006
@@ -1,3 +1,3 @@
-MD5 (jday-1.3.tar.gz) =3D 4b6e8e4c9322a50322e0eebf86cb32f4
-SHA256 (jday-1.3.tar.gz) =3D 45a3c1bc2657f3099a43e6ce408b58d49e06fa13190=
a7f3d5a0973d34a72b2e7
-SIZE (jday-1.3.tar.gz) =3D 211601
+MD5 (jday-2.4.tar.gz) =3D 817af56005d1346677271ed2fab63ef5
+SHA256 (jday-2.4.tar.gz) =3D 3b15f3a1b552ffae7c343bd47bf89e8073da9ef8c2e=
c6d79b90d56f8c3a06fda
+SIZE (jday-2.4.tar.gz) =3D 337012
diff -NrU3 jday.orig/files/patch-aa jday/files/patch-aa
--- jday.orig/files/patch-aa	Wed Dec 31 19:00:00 1969
+++ jday/files/patch-aa	Thu Apr 20 07:32:18 2006
@@ -0,0 +1,77 @@
+--- configure.orig	Mon Oct 10 15:18:28 2005
++++ configure	Thu Apr 20 07:30:24 2006
+@@ -463,7 +463,7 @@
+ # include <unistd.h>
+ #endif"
+=20
+-ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACK=
AGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_t=
ransform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir=
 localstatedir libdir includedir oldincludedir infodir mandir build_alias=
 host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM I=
NSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUT=
OMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROG=
RAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAIN=
ER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT ACLOCAL_AMFLAGS CC CFLAGS LDFLAG=
S CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE=
 AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FA=
LSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor h=
ost_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct=
_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAG=
S ac_ct_F77 LIBTOOL pkgconfig_libdir pkgconfig_libfile LIBOBJS LTLIBOBJS'=

++ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACK=
AGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_t=
ransform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir=
 localstatedir libdir libdatadir includedir oldincludedir infodir mandir =
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTAL=
L_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL A=
UTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL=
_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__unt=
ar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT ACLOCAL_AMFLAGS CC CF=
LAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote=
 AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__f=
astdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu ho=
st_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXX=
FLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCP=
P F77 FFLAGS ac_ct_F77 LIBTOOL pkgconfig_libdir pkgconfig_libfile LIBOBJS=
 LTLIBOBJS'
+ ac_subst_files=3D''
+=20
+ # Initialize some variables set by options.
+@@ -499,6 +499,7 @@
+ sharedstatedir=3D'${prefix}/com'
+ localstatedir=3D'${prefix}/var'
+ libdir=3D'${exec_prefix}/lib'
++libdatadir=3D'${exec_prefix}/libdata'
+ includedir=3D'${prefix}/include'
+ oldincludedir=3D'/usr/include'
+ infodir=3D'${prefix}/info'
+@@ -822,7 +823,7 @@
+=20
+ # Be sure to have absolute paths.
+ for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstated=
ir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++	      localstatedir libdir libdatadir includedir oldincludedir infodir=
 mandir
+ do
+   eval ac_val=3D$`echo $ac_var`
+   case $ac_val in
+@@ -19700,7 +19701,7 @@
+ echo "$as_me:$LINENO: checking our pkgconfig_libdir" >&5
+ echo $ECHO_N "checking our pkgconfig_libdir... $ECHO_C" >&6
+ test ".$pkgconfig_libdir" =3D "." && \
+-pkgconfig_libdir=3D'${libdir}/pkgconfig'
++pkgconfig_libdir=3D'${libdatadir}/pkgconfig'
+ ax_create_pkgconfig_libdir=3D`eval echo "$pkgconfig_libdir"`
+ ax_create_pkgconfig_libdir=3D`eval echo "$ax_create_pkgconfig_libdir"`
+ ax_create_pkgconfig_libdir=3D`eval echo "$ax_create_pkgconfig_libdir"`
+@@ -20510,6 +20511,7 @@
+ s,@sharedstatedir@,$sharedstatedir,;t t
+ s,@localstatedir@,$localstatedir,;t t
+ s,@libdir@,$libdir,;t t
++s,@libdatadir@,$libdatadir,;t t
+ s,@includedir@,$includedir,;t t
+ s,@oldincludedir@,$oldincludedir,;t t
+ s,@infodir@,$infodir,;t t
+@@ -21049,6 +21051,7 @@
+ exec_prefix=3D@exec_prefix@
+ bindir=3D@bindir@
+ libdir=3D@libdir@
++libdatadir=3D@libdatadir@
+ datadir=3D@datadir@
+ sysconfdir=3D@sysconfdir@
+ includedir=3D@includedir@
+@@ -21070,6 +21073,7 @@
+ s|@exec_prefix@|${pkgconfig_execprefix}|
+ s|@bindir@|${pkgconfig_bindir}|
+ s|@libdir@|${pkgconfig_libdir}|
++s|@libdatadir@|${pkgconfig_libdir}|
+ s|@datadir@|${pkgconfig_datadir}|
+ s|@sysconfdir@|${pkgconfig_sysconfdir}|
+ s|@includedir@|${pkgconfig_includedir}|
+@@ -21096,6 +21100,7 @@
+ s|@exec_prefix@|${pkgconfig_execprefix}|
+ s|@bindir@|${pkgconfig_bindir}|
+ s|@libdir@|${pkgconfig_src_libdir}|
++s|@libdatadir@|${pkgconfig_libdir}|
+ s|@datadir@|${pkgconfig_datadir}|
+ s|@sysconfdir@|${pkgconfig_sysconfdir}|
+ s|@includedir@|${pkgconfig_src_headers}|
+@@ -21126,6 +21131,7 @@
+ s|@exec_prefix@|\"${pkgconfig_execprefix}\"|
+ s|@bindir@|\"${pkgconfig_bindir}\"|
+ s|@libdir@|\"${pkgconfig_src_libdir}\"|
++s|@libdatadir@|\"${pkgconfig_libdir}\"|
+ s|@datadir@|\"${pkgconfig_datadir}\"|
+ s|@sysconfdir@|\"${pkgconfig_sysconfdir}\"|
+ s|@includedir@|\"${pkgconfig_src_headers}\"|
diff -NrU3 jday.orig/files/patch-ab jday/files/patch-ab
--- jday.orig/files/patch-ab	Wed Dec 31 19:00:00 1969
+++ jday/files/patch-ab	Thu Apr 20 07:35:24 2006
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	Mon Oct 10 15:18:29 2005
++++ Makefile.in	Thu Apr 20 07:34:35 2006
+@@ -206,6 +206,7 @@
+ infodir =3D @infodir@
+ install_sh =3D @install_sh@
+ libdir =3D @libdir@
++libdatadir =3D @libdatadir@
+ libexecdir =3D @libexecdir@
+ localstatedir =3D @localstatedir@
+ mandir =3D @mandir@
+@@ -233,7 +234,7 @@
+ EXTRA_DIST =3D jday.1 CalDate.inc CalDate.pm J2D.pl Jday.php Jday.pl \
+ 	JdayTest.pl RunTest Testdbd dbd.awk jday.awk jday.html jday.pc.in
+=20
+-pkgconfigdir =3D $(libdir)/pkgconfig
++pkgconfigdir =3D $(libdatadir)/pkgconfig
+ pkgconfig_DATA =3D jday.pc
+ DISTCLEANFILES =3D jday.pc jday-uninstalled.pc jday-uninstalled.sh
+ all: all-am
diff -NrU3 jday.orig/files/patch-ac jday/files/patch-ac
--- jday.orig/files/patch-ac	Wed Dec 31 19:00:00 1969
+++ jday/files/patch-ac	Thu Apr 20 07:32:23 2006
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Thu Apr 20 07:27:52 2006
++++ Makefile.am	Thu Apr 20 07:28:02 2006
+@@ -19,7 +19,7 @@
+=20
+ ACLOCAL_AMFLAGS =3D -I m4
+=20
+-pkgconfigdir =3D $(libdir)/pkgconfig
++pkgconfigdir =3D $(libdatadir)/pkgconfig
+ pkgconfig_DATA =3D jday.pc
+=20
+ check:
diff -NrU3 jday.orig/files/patch-jday.c jday/files/patch-jday.c
--- jday.orig/files/patch-jday.c	Wed Apr 19 13:20:01 2006
+++ jday/files/patch-jday.c	Wed Dec 31 19:00:00 1969
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/astro/jday/files/patch-jday.c,v 1.1 2003/01/01 22:06:00 =
naddy Exp $
-
---- jday.c.orig	Mon Dec 30 16:49:30 2002
-+++ jday.c	Mon Dec 30 16:49:44 2002
-@@ -122,7 +122,7 @@
- 				if ( day < 1 ) day =3D 1;
- 			case 3:
- 		if ( ! strcmp((const char *)argv[1], (const char *) "-d") ) {
--	if ( 3 !=3D sscanf( argv[2], "%d/%d/%d", & year, & mo, & day ) ) {
-+	if ( 3 !=3D sscanf( argv[2], "%ld/%d/%d", & year, & mo, & day ) ) {
- fprintf( stderr, "failed sscanf for ymd\n" );
- 		exit (-1);
- 	} else {
diff -NrU3 jday.orig/pkg-plist jday/pkg-plist
--- jday.orig/pkg-plist	Wed Apr 19 13:20:01 2006
+++ jday/pkg-plist	Wed Dec 31 19:00:00 1969
@@ -1,6 +0,0 @@
-@comment $FreeBSD: ports/astro/jday/pkg-plist,v 1.2 2003/01/01 22:06:00 =
naddy Exp $
-bin/dbd
-bin/j2d
-bin/jday
-include/jday.h
-lib/libjday.a

--------------040407000703050806000601--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44477425.1020404>