From will@argon.blackdawn.com  Tue Dec 28 17:28:39 1999
Return-Path: <will@argon.blackdawn.com>
Received: from pluto.psn.net (pluto.psn.net [207.211.58.12])
	by hub.freebsd.org (Postfix) with ESMTP id 7520214D0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Dec 1999 17:28:32 -0800 (PST)
	(envelope-from will@argon.blackdawn.com)
Received: from 14-078.008.popsite.net ([209.69.195.78] helo=shadow.blackdawn.com)
	by pluto.psn.net with esmtp (PSN Internet Service 3.12 #1)
	for FreeBSD-gnats-submit@FreeBSD.ORG
	id 1237ug-0007d7-00; Tue, 28 Dec 1999 18:28:31 -0700
Received: from argon.blackdawn.com (argon.blackdawn.com [192.168.0.3])
	by shadow.blackdawn.com (8.9.3/8.9.3) with ESMTP id UAA37439
	for <FreeBSD-gnats-submit@FreeBSD.ORG>; Tue, 28 Dec 1999 20:28:26 -0500 (EST)
	(envelope-from will@argon.blackdawn.com)
Received: (from root@localhost)
	by argon.blackdawn.com (8.9.3/8.9.3) id UAA01147;
	Tue, 28 Dec 1999 20:28:01 -0500 (EST)
	(envelope-from will)
Message-Id: <199912290128.UAA01147@argon.blackdawn.com>
Date: Tue, 28 Dec 1999 20:28:01 -0500 (EST)
From: Will Andrews <andrews@technologist.com>
Sender: will@argon.blackdawn.com
Reply-To: Will Andrews <andrews@technologist.com>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: update port: archivers/makeself -> 1.5.3
X-Send-Pr-Version: 3.2

>Number:         15755
>Category:       ports
>Synopsis:       update port: archivers/makeself -> 1.5.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 28 17:30:00 PST 1999
>Closed-Date:    Tue Dec 28 18:46:52 PST 1999
>Last-Modified:  Tue Dec 28 18:51:01 PST 1999
>Originator:     Will Andrews
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
none
>Environment:

FreeBSD argon.blackdawn.com 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Tue Nov 30 10:14:31 EST 1999     root@argon.blackdawn.com:/usr/src/sys/compile/ARGON  i386

>Description:

Update for makeself. Sorry I didn't get this in sooner.
This thing extracts itself, but the script checks for
X11 and tries to use that to extract itself.. I just
set DISPLAY to nothing and it should be okay for any
given situation.

*mutter* I hate programs that don't update the name of
their distfiles in accordance to version upgrades.

>How-To-Repeat:

Use the diff below to fix the current port.

>Fix:

diff -urN makeself/Makefile makeself.new/Makefile
--- makeself/Makefile	Fri Dec 10 10:21:47 1999
+++ makeself.new/Makefile	Tue Dec 28 20:21:56 1999
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	makeself
-# Version required:	1.4
+# Version required:	1.5.3
 # Date created:		22 Oct 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	makeself
-PKGNAME=	makeself-1.4
+PKGNAME=	makeself-1.5.3
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.lokigames.com/~megastep/makeself/
 EXTRACT_SUFX=	.gz.sh
@@ -18,8 +18,14 @@
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
+# The DISPLAY thing is to prevent the script from trying to launch a xterm
+# just to extract the source.
+pre-patch:
+	(cd ${WRKDIR} && ${SETENV} DISPLAY="" ${SH} ${DISTNAME}${EXTRACT_SUFX})
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/makeself.gz.sh ${PREFIX}/bin/makeself
+	@${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself
 
 .include <bsd.port.mk>
diff -urN makeself/files/md5 makeself.new/files/md5
--- makeself/files/md5	Fri Dec 10 10:26:07 1999
+++ makeself.new/files/md5	Tue Dec 28 20:22:37 1999
@@ -1 +1 @@
-MD5 (makeself.gz.sh) = 634138c39538210e28dfcd3187645aa8
+MD5 (makeself.gz.sh) = 41608cac2b9c01dc44c08c96dc5ac3bf

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: jedgar 
State-Changed-When: Tue Dec 28 18:46:52 PST 1999 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
