From nobody@FreeBSD.org  Fri Oct 12 22:43:55 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5921716A419
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 12 Oct 2007 22:43:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 557AA13C469
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 12 Oct 2007 22:43:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9CMhrmB013156
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 12 Oct 2007 22:43:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l9CMhrGK013155;
	Fri, 12 Oct 2007 22:43:53 GMT
	(envelope-from nobody)
Message-Id: <200710122243.l9CMhrGK013155@www.freebsd.org>
Date: Fri, 12 Oct 2007 22:43:53 GMT
From: Daniel Voisine <voisined@wit.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] math/dislin - update to 9.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         117145
>Category:       ports
>Synopsis:       [PATCH] math/dislin - update to 9.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 12 22:50:02 UTC 2007
>Closed-Date:    Sat Feb 16 22:54:03 UTC 2008
>Last-Modified:  Sat Feb 16 23:00:02 UTC 2008
>Originator:     Daniel Voisine
>Release:        6.2-RELEASE-p4
>Organization:
>Environment:
FreeBSD dell.voisine.private 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007     root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Distfile removed from master site, currently unfetchable.

Upgrade to Dislin 9.2

Change log at http://www.mps.mpg.de/dislin/news.html
>How-To-Repeat:
cd /usr/ports/math/dislin && make install
>Fix:
The following patch

Patch attached with submission follows:

diff -ru /usr/ports/math/dislin/Makefile ./Makefile
--- /usr/ports/math/dislin/Makefile	Sat May 19 16:14:53 2007
+++ ./Makefile	Fri Oct 12 18:04:02 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dislin
-PORTVERSION=	9.1
-PORTREVISION=	2
+PORTVERSION=	9.2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/grafik/dislin/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.fbsd${BINVER}
@@ -43,7 +42,7 @@
 .endif
 
 do-install:
-	(cd ${WRKSRC} && ${ENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL)
+	cd ${WRKSRC} && ${SETENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL
 	${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin
 .for _program in ${PROGRAMS}
 	${LN} -s ${DISLIN_DIR}/bin/dislin.sh ${PREFIX}/bin/${_program}
diff -ru /usr/ports/math/dislin/distinfo-5.4 ./distinfo-5.4
--- /usr/ports/math/dislin/distinfo-5.4	Tue Apr 24 03:16:14 2007
+++ ./distinfo-5.4	Fri Oct 12 17:56:01 2007
@@ -1,3 +1,3 @@
-MD5 (dislin-9.1.fbsd-5.4.tar.gz) = 3ec480c711324e466ce178e1cdb6fe65
-SHA256 (dislin-9.1.fbsd-5.4.tar.gz) = 4a8e7a80daa549bc283bf0d54bcc59534a342cdbda7c619ad083da37975870a1
-SIZE (dislin-9.1.fbsd-5.4.tar.gz) = 10704918
+MD5 (dislin-9.2.fbsd-5.4.tar.gz) = 1979b585ec052c5f6d847d912356f050
+SHA256 (dislin-9.2.fbsd-5.4.tar.gz) = a74defbc799966a0c504a6d2ee02818f4170a708274700cb8acc14b00fa375c5
+SIZE (dislin-9.2.fbsd-5.4.tar.gz) = 13909853
diff -ru /usr/ports/math/dislin/distinfo-6.0 ./distinfo-6.0
--- /usr/ports/math/dislin/distinfo-6.0	Tue Apr 24 03:16:14 2007
+++ ./distinfo-6.0	Fri Oct 12 17:52:36 2007
@@ -1,3 +1,3 @@
-MD5 (dislin-9.1.fbsd-6.0.tar.gz) = 81828566b11e897090c8467768295b15
-SHA256 (dislin-9.1.fbsd-6.0.tar.gz) = c5df6cd5976448bd7ab509b3cc8bfa1d7cbacded538696a49755f905e5673e5f
-SIZE (dislin-9.1.fbsd-6.0.tar.gz) = 10712442
+MD5 (dislin-9.2.fbsd-6.0.tar.gz) = a06c6464fb87c65f1c9ef52970ef3382
+SHA256 (dislin-9.2.fbsd-6.0.tar.gz) = 7b172a010c4389c3d11f8690aa9e94b7bf039d7f8e358dd21d407b46476d88cd
+SIZE (dislin-9.2.fbsd-6.0.tar.gz) = 13918462
diff -ru /usr/ports/math/dislin/pkg-descr ./pkg-descr
--- /usr/ports/math/dislin/pkg-descr	Sun Dec 14 10:23:22 2003
+++ ./pkg-descr	Fri Oct 12 17:53:09 2007
@@ -11,4 +11,4 @@
 either be printed on various devices using the  DISLIN driver program DIS-
 DRV or imported into third party products such as TeX and MS Word.
 
-WWW: http://www.linmpi.mpg.de/dislin/
+WWW: http://www.mps.mpg.de/dislin/
diff -ru /usr/ports/math/dislin/pkg-plist ./pkg-plist
--- /usr/ports/math/dislin/pkg-plist	Sat Nov 18 12:18:45 2006
+++ ./pkg-plist	Fri Oct 12 18:18:20 2007
@@ -107,7 +107,6 @@
 dislin/java/conshd.java
 dislin/java/contour.java
 dislin/java/curve.java
-dislin/java/disjava-%%VER%%.so
 dislin/java/dislin-%%VER%%.java.tar.gz
 dislin/java/dislin.jar
 dislin/java/intpol.java
@@ -126,24 +125,17 @@
 dislin/lib/dislin-%%VER%%.so
 dislin/lib/dislin_d-%%VER%%.a
 dislin/lib/dislin_d-%%VER%%.so
-dislin/libdisjava.so
-dislin/libdisjava.so.8
-dislin/libdisjava.so.9
 dislin/libdislin.a
 dislin/libdislin.so
-dislin/libdislin.so.8
 dislin/libdislin.so.9
 dislin/libdislin_d.a
 dislin/libdislin_d.so
-dislin/libdislin_d.so.8
 dislin/libdislin_d.so.9
 dislin/libdislnc.a
 dislin/libdislnc.so
-dislin/libdislnc.so.8
 dislin/libdislnc.so.9
 dislin/libdislnc_d.a
 dislin/libdislnc_d.so
-dislin/libdislnc_d.so.8
 dislin/libdislnc_d.so.9
 dislin/man/appa.txt
 dislin/man/appb.txt
@@ -181,10 +173,13 @@
 dislin/man/kap7.txt
 dislin/man/kap8.txt
 dislin/man/kap9.txt
+dislin/map/map0.dat
 dislin/map/map1.dat
 dislin/map/map2.dat
 dislin/map/map3.dat
 dislin/map/map4.dat
+dislin/map/map5.dat
+dislin/map/map6.dat
 dislin/perl/Dislin.pm
 dislin/perl/Dislin.so
 dislin/perl/areaf.pl


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: thierry 
State-Changed-When: Dim 23 dc 2007 20:39:06 UTC 
State-Changed-Why:  

It seems that the file has been updated: 

=> dislin-9.2.fbsd-6.0.tar.gz doesn't seem to exist in /usr/ports/distfiles/. 
=> Attempting to fetch from ftp://ftp.gwdg.de/pub/grafik/dislin/unix/. 
fetch: ftp://ftp.gwdg.de/pub/grafik/dislin/unix/dislin-9.2.fbsd-6.0.tar.gz: size mismatch: expected 13918462, actual 14463705 
=> Attempting to fetch from ftp://ftp.fr.freebsd.org/pub/FreeBSD/ports/distfiles/. 
fetch: ftp://ftp.fr.freebsd.org/pub/FreeBSD/ports/distfiles/dislin-9.2.fbsd-6.0.tar.gz: File unavailable (e.g., file not found, no access) 
=> Couldn't fetch it - please try to retrieve this 
=> port manually into /usr/ports/distfiles/ and try again. 
*** Error code 1 

Moreover, I guess that compat6x should be used on FreeBSD-7 and 8, and 
I propose the following patch: 

--- dislin.diff begins here --- 
--- math/dislin/Makefile.orig	2007-12-23 21:37:11.000000000 +0100 
+++ math/dislin/Makefile	2007-12-23 21:37:44.000000000 +0100 
@@ -20,8 +20,6 @@ 
NO_BUILD=	yes 
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION} 

-BROKEN=		does not fetch 
- 
MD5_FILE=	${MASTERDIR}/distinfo${BINVER} 
PLIST_SUB+=	VER=${PORTVERSION} MAJ=${MAJ} 
SUB_FILES=	dislin.sh pkg-message 
@@ -43,6 +41,10 @@ 
BINVER=		-6.0 
.endif 

+.if ${OSVERSION} >= 700000 
+LIB_DEPENDS+=	z.3:${PORTSDIR}/misc/compat6x 
+.endif 
+ 
do-install: 
cd ${WRKSRC} && ${SETENV} DISLIN=${DISLIN_DIR} ${SH} INSTALL 
${INSTALL_SCRIPT} ${WRKDIR}/dislin.sh ${DISLIN_DIR}/bin 
--- dislin.diff ends here --- 

Could you please check it? 



Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Dim 23 dc 2007 20:39:06 UTC 
Responsible-Changed-Why:  

Take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=117145 
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Sam 16 fv 2008 22:52:51 UTC 
State-Changed-Why:  

Committed, after feedback time-out. 

Anyway, thanks for your PR! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=117145 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117145: commit references a PR
Date: Sat, 16 Feb 2008 22:52:30 +0000 (UTC)

 thierry     2008-02-16 22:52:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/dislin          Makefile distinfo-5.4 distinfo-6.0 
                          pkg-descr pkg-plist 
     math/dislin/files    dislin.sh.in pkg-message.in 
   Removed files:
     math/dislin          distinfo 
   Log:
   Upgrade to 9.2 and unbreak.
   
   Change log at <http://www.mps.mpg.de/dislin/news.html>
   
   PR:             ports/117145
   Submitted by:   Daniel Voisine <voisined (at) wit.edu>
   
   Revision  Changes    Path
   1.28      +11 -7     ports/math/dislin/Makefile
   1.9       +0 -3      ports/math/dislin/distinfo (dead)
   1.6       +3 -3      ports/math/dislin/distinfo-5.4
   1.6       +3 -3      ports/math/dislin/distinfo-6.0
   1.2       +4 -1      ports/math/dislin/files/dislin.sh.in
   1.3       +1 -9      ports/math/dislin/files/pkg-message.in
   1.2       +1 -1      ports/math/dislin/pkg-descr
   1.4       +5 -9      ports/math/dislin/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
