Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Mar 2003 14:41:42 +0100 (MET)
From:      Roland Jesse <roland.jesse@gmx.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        arved@FreeBSD.org
Subject:   ports/48918: lang/squeak3: fix distfile fetch problems (SUPERCEEDS ports/47096)
Message-ID:  <200303041341.h24Dfgqi083460@arthur.cs.uni-magdeburg.de>

next in thread | raw e-mail | index | archive | help

>Number:         48918
>Category:       ports
>Synopsis:       lang/squeak3: fix distfile fetch problems (SUPERCEEDS ports/47096)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 04 05:50:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Roland Jesse
>Release:        FreeBSD 4.8-PRERELEASE i386
>Organization:
Private
>Environment:
System: FreeBSD 4.8-PRERELEASE #11: Thu Feb 27 13:04:22 CET 2003 i386
>Description:
One of the distfiles has changed and was therefore unfetchable. This
is now fixed.

This PR does not fix ports/46180 as I cannot reproduced the behaviour
described therein.

Compared to PR ports/47096, some issues with pkg-plist are
addressed. This is now in "works for me" state without much testing
done.

No new files are introduced to CVS by this PR.
>How-To-Repeat:

build and install lang/squeak3

>Fix:
diff -ruN squeak3/Makefile squeak3.new/Makefile
--- squeak3/Makefile	Tue Feb 25 08:51:17 2003
+++ squeak3.new/Makefile	Tue Mar  4 14:21:24 2003
@@ -21,7 +21,7 @@
 # Don't set USE_ZIP as this breaks EXTRACT_CMD, EXTRACT_SUFX, and what not.
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-SQUEAK_VERSION=	3.2-4
+SQUEAK_VERSION=	3.2-5
 SQUEAK_PATCHNR=	4956
 SQUEAK_SRC=	SqueakV3.sources.gz
 SQUEAK_IMAGE_SRC=	Squeak3.2-4956.zip
@@ -32,6 +32,7 @@
 MAN1=		inisqueak.1 squeak.1
 USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${PREFIX}/share/squeak/${SQUEAK_VERSION}
@@ -54,6 +55,7 @@
 
 pre-configure:
 	@${MKDIR} ${BUILD_WRKSRC}
+	@cd ${WRKSRC}/platforms/unix/npsqueak && ${REINPLACE_CMD} -e 's|include|include -I${X11BASE}/include|g' Makefile
 
 post-install:
 	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${SQUEAK_SRC} ${PREFIX}/share/squeak/)
diff -ruN squeak3/distinfo squeak3.new/distinfo
--- squeak3/distinfo	Mon Sep 23 10:20:30 2002
+++ squeak3.new/distinfo	Tue Jan 14 16:00:54 2003
@@ -1,3 +1,3 @@
-MD5 (squeak/Squeak-3.2-4.src.tar.gz) = 14d19111d8a976cdb6e0bd76d43df7a6
+MD5 (squeak/Squeak-3.2-5.src.tar.gz) = 4fb17638e6e674a538f1404c8e60abff
 MD5 (squeak/SqueakV3.sources.gz) = 7dc6b3840e6bc1e5f81e3717fb46d2c3
 MD5 (squeak/Squeak3.2-4956.zip) = bb87597c508b92aab832bd067c49e9c6
diff -ruN squeak3/files/patch-openpty-h squeak3.new/files/patch-openpty-h
--- squeak3/files/patch-openpty-h	Sat Sep 21 02:47:27 2002
+++ squeak3.new/files/patch-openpty-h	Tue Jan 14 16:03:33 2003
@@ -1,8 +1,8 @@
---- platforms/unix/plugins/PseudoTTYPlugin/openpty.h.orig	Tue Sep 10 13:38:07 2002
-+++ platforms/unix/plugins/PseudoTTYPlugin/openpty.h	Tue Sep 10 13:38:52 2002
-@@ -43,7 +43,10 @@
- # elif defined(HAVE_UTIL_H)
- #   include <util.h>		/* openpty() */
+--- platforms/unix/plugins/PseudoTTYPlugin/openpty.h.orig	Tue Jan 14 16:02:55 2003
++++ platforms/unix/plugins/PseudoTTYPlugin/openpty.h	Tue Jan 14 16:03:09 2003
+@@ -45,7 +45,10 @@
+ # elif defined(HAVE_LIBUTIL_H)
+ #   include <libutil.h>		/* openpty() on FreeBSD */
  # else
 -#   error: cannot find headers for openpty()
 +#   include <sys/types.h>
diff -ruN squeak3/pkg-plist squeak3.new/pkg-plist
--- squeak3/pkg-plist	Mon Sep 23 10:20:30 2002
+++ squeak3.new/pkg-plist	Tue Mar  4 14:32:59 2003
@@ -1,13 +1,18 @@
-bin/squeak
 bin/inisqueak
-share/squeak/3.2-4/squeak
-share/squeak/3.2-4/B3DAcceleratorPlugin.la
-share/squeak/3.2-4/UnixOSProcessPlugin.la
-share/squeak/3.2-4/libB3DAcceleratorPlugin.a
-share/squeak/3.2-4/libUnixOSProcessPlugin.a
+bin/squeak
+share/squeak/3.2-5/B3DAcceleratorPlugin.la
+share/squeak/3.2-5/B3DAcceleratorPlugin.so
+share/squeak/3.2-5/PseudoTTYPlugin.la
+share/squeak/3.2-5/PseudoTTYPlugin.so
+share/squeak/3.2-5/UnixOSProcessPlugin.la
+share/squeak/3.2-5/UnixOSProcessPlugin.so
+share/squeak/3.2-5/npsqueak.so
+share/squeak/3.2-5/npsqueakrun
+share/squeak/3.2-5/squeak
 share/squeak/ReadMe.txt
 share/squeak/Squeak3.2-4956.changes.gz
 share/squeak/Squeak3.2-4956.image.gz
 share/squeak/SqueakV3.sources
-@dirrm share/squeak/3.2-4
+share/squeak/npsqueakregister
+@dirrm share/squeak/3.2-5
 @dirrm share/squeak
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




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