Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Aug 2010 11:23:11 +0100
From:      Chris Rees <utisoft@gmail.com>
To:        Rob Farmer <rfarmer@predatorlabs.net>
Cc:        cvs-ports@freebsd.org, Alexey Dokuchaev <danfe@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org>, cvs-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: cvs commit: ports/java/jgraphx Makefile distinfo
Message-ID:  <AANLkTinqUUV4v=SGnoq_T8onxss5SkyRm259x04NaGjv@mail.gmail.com>
In-Reply-To: <AANLkTik8O4fpVHU%2B_pFGTRBapTtMx%2B5fJgk4M8QnZsCw@mail.gmail.com>
References:  <201008221158.o7MBwce6093897@repoman.freebsd.org> <AANLkTinwzkmw3%2BkSjddODtzFSCD-5RBb1gU48%2BM6w58E@mail.gmail.com> <20100827062503.GA85184@FreeBSD.org> <AANLkTinnsfdVVRi39HEp24bXMM2ykWydnmt%2BiEdDSqHH@mail.gmail.com> <AANLkTik8O4fpVHU%2B_pFGTRBapTtMx%2B5fJgk4M8QnZsCw@mail.gmail.com>

index | next in thread | previous in thread | raw e-mail

[-- Attachment #1 --]
On 29 August 2010 01:11, Rob Farmer <rfarmer@predatorlabs.net> wrote:
> On Sat, Aug 28, 2010 at 2:28 AM, Chris Rees <utisoft@gmail.com> wrote:
>> 2010/8/27 Alexey Dokuchaev <danfe@freebsd.org>:
>>> On Thu, Aug 26, 2010 at 09:53:32PM -0700, Rob Farmer wrote:
>>>> This breaks math/scilab (which is the only dependency in the ports
>>>> tree). Unfortunately, the author of jgraphx seems to completely
>>>> disregard backwards compatibility and changes the API in virtually
>>>> every release.
>>>>
>>>> I tried to patch Scilab based on their git repository (which has
>>>> support for 1.4.0.1), but hundreds of revisions have passed and they
>>>> have rearranged their tree a bit and added/removed some files, so it
>>>> didn't go well.
>>>>
>>>> IMHO, we need to either create a separate jgraphx-scilab port or keep
>>>> this in sync with Scilab (this is what Debian, Ubuntu, and Gentoo are
>>>> doing).
>>>
>>> Considering Scilab is the only consumer of jgraphx, it seems having
>>> special port would be an overkill.  I think we should keep the two in
>>> sync, and probably work with upstream maintainers of both projects to
>>> improve compatibility and API inheritance in the future.  Separate port
>>> of jgraphx-scilab is palliative solution, i.e. it simply increases the
>>> entropy, not solving the underlying problem.
>>>
>>> ./danfe
>>
>>
>> Since Scilab is the only consumer of jgraphx, I don't mind reverting it.
>>
>> Actually, I wrote that while trying to repair Scilab myself, so if you
>> want maintainership of jgraphx too, that's fine.
>
> I don't want to feel like I'm stealing your ports, but I do think it
> would be a good idea to have them maintained together.
>
>>
>> Alternatively you could have it as another distfile in Scilab rather
>> than depending on the port....
>
> I hadn't thought about this, but it may actually be the best solution
> - as far as I'm aware, the reason for having libraries in separate
> ports is to allow multiple applications to use the same copy, but
> given the instability of the jgraphx API, I think it is unlikely that
> multiple ports could depend on one common version of jgraphx (at least
> without significant patching), so the benefits of having a jgraphx
> port are probably limited. Thoughts?
>

You're not stealing my ports, you'd be taking a logical step to fixing
the madness!

You are welcome to jgraphx if you want it, though having thought about
the instability, maybe the alternative distfile could be a good
solution. Have a look at the attached patch; the only thing i haven't
done is told configure it's not a problem that jgraphx.jar isn't there
yet...

Of course, jgraphx is still a useful port for people who want to use
it themselves in their own programming; there are plenty of other
ports that aren't depended on by anything else!

Chris

[-- Attachment #2 --]
diff -ruN scilab.orig/Makefile scilab/Makefile
--- scilab.orig/Makefile	2010-05-31 02:59:48.000000000 +0100
+++ scilab/Makefile	2010-08-29 11:07:49.000000000 +0100
@@ -9,12 +9,18 @@
 PORTVERSION=	5.2.2
 PORTREVISION=	2
 CATEGORIES=	math cad parallel java
-MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/
-EXTRACT_SUFX=	-src.tar.gz
+MASTER_SITES=	http://www.scilab.org/download/${PORTVERSION}/:scilab \
+		http://www.bayofrum.net/dist/jgraphx/:jgraphx \
+		http://cerberus.bayofrum.net/dist/jgraphx/:jgraphx
+DISTFILES=	${DISTNAME}-src.tar.gz:scilab \
+		${JGRAPHX_JAR}:jgraphx
 
 MAINTAINER=	rfarmer@predatorlabs.net
 COMMENT=	Scientific software package for numerical computations
 
+JGRAPHX_VERSION=	1.3.0.0
+JGRAPHX_JAR=	jgraphx-${JGRAPHX_VERSION:C/\./_/g}.jar
+
 # A partial dependencies list can be found at:
 # http://wiki.scilab.org/Dependencies_of_Scilab_5.X
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
@@ -209,6 +215,7 @@
 	${REINPLACE_CMD} -e 's|$$jardir/batik.jar|${LOCALBASE}/share/java/batik/batik.jar|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|$$jardir/jgraphx.jar|${DATADIR}/modules/jgraphx.jar|' ${WRKSRC}/configure
 	# Build fixes
 	${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in
 	${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h
@@ -233,5 +240,6 @@
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${FIND} ${WRKSRC} -name .cvsignore -delete
+	@${MKDIR} ${DATADIR}/modules && ${INSTALL_DATA} ${DISTDIR}/${JGRAPHX_JAR} ${DATADIR}/modules
 
 .include <bsd.port.mk>
diff -ruN scilab.orig/distinfo scilab/distinfo
--- scilab.orig/distinfo	2010-04-30 09:54:39.000000000 +0100
+++ scilab/distinfo	2010-08-29 11:11:37.000000000 +0100
@@ -1,3 +1,6 @@
 MD5 (scilab-5.2.2-src.tar.gz) = 35e8a22edb348f405360d3a07ed4faab
 SHA256 (scilab-5.2.2-src.tar.gz) = 6f8800bc8ac9128187d1f9a98a5e459bbfa2b66967caed8ab659ff2ba51f1cf2
 SIZE (scilab-5.2.2-src.tar.gz) = 54088580
+MD5 (jgraphx-1_3_0_0.jar) = b9e24f0b428c679697e763e9b0ba5671
+SHA256 (jgraphx-1_3_0_0.jar) = 0f3728b47c9fd3977a063212f68e43639c2283eb84fbce437275b679e6e4a6b2
+SIZE (jgraphx-1_3_0_0.jar) = 326596
diff -ruN scilab.orig/pkg-plist scilab/pkg-plist
--- scilab.orig/pkg-plist	2010-04-30 09:54:39.000000000 +0100
+++ scilab/pkg-plist	2010-08-29 11:20:12.000000000 +0100
@@ -5704,6 +5704,7 @@
 %%GUI%%%%DATADIR%%/modules/javasci/tests/unit_tests/javac.sci
 %%GUI%%%%DATADIR%%/modules/javasci/tests/unit_tests/test_java.sci
 %%GUI%%%%DATADIR%%/modules/javasci/version.xml
+%%DATADIR%%/modules/jgraphx.jar
 %%DATADIR%%/modules/jvm/changelog.txt
 %%DATADIR%%/modules/jvm/etc/jvm.quit
 %%DATADIR%%/modules/jvm/etc/jvm.start
help

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