From owner-freebsd-ports  Fri Mar  3 13:30:18 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 20C3537B6E3
	for <freebsd-ports@FreeBSD.org>; Fri,  3 Mar 2000 13:30:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA65050;
	Fri, 3 Mar 2000 13:30:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 5440237B6E3
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  3 Mar 2000 13:21:59 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA64132;
	Fri, 3 Mar 2000 13:21:59 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Message-Id: <200003032121.NAA64132@freefall.freebsd.org>
Date: Fri, 3 Mar 2000 13:21:59 -0800 (PST)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/17171: Update port: x11/xloadimage
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         17171
>Category:       ports
>Synopsis:       Update port: x11/xloadimage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar  3 13:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Fix usage of PREFIX/X11BASE

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11/xloadimage/Makefile x11/xloadimage/Makefile
--- /usr/ports/x11/xloadimage/Makefile	Tue Aug 31 19:19:05 1999
+++ x11/xloadimage/Makefile	Fri Mar  3 23:33:12 2000
@@ -1,7 +1,7 @@
-# New ports collection makefile for:    xloadimage
-# Version required:     4.1
-# Date created:         9 January 1994
-# Whom:                 jmz
+# New ports collection makefile for:	xloadimage
+# Version required:	4.1
+# Date created:		9 January 1994
+# Whom:			jmz
 #
 # $FreeBSD: ports/x11/xloadimage/Makefile,v 1.16 1999/08/31 02:51:04 peter Exp $
 #
@@ -9,25 +9,22 @@
 DISTNAME=	xloadimage.4.1
 PKGNAME=	xloadimage-4.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
+		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-MAN1=		xloadimage.1
-MANCOMPRESSED=	yes
-
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-
 ALL_TARGET=
+MAN1=		xloadimage.1
 
 do-configure:
-	cd ${WRKSRC} && make configure </dev/null
-	cd ${WRKSRC} && ${ECHO} SYSPATHFILE=${X11BASE}/lib/X11/app-defaults/Xloadimage >> Makefile
+	cd ${WRKSRC} && ${MAKE} configure </dev/null
+	cd ${WRKSRC} && ${ECHO} SYSPATHFILE=${PREFIX}/lib/X11/app-defaults/Xloadimage >> Makefile
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} xloadimage uufilter ${X11BASE}/bin
-	cd ${WRKSRC} && ${INSTALL_DATA} xloadimagerc ${X11BASE}/lib/X11/app-defaults/Xloadimage
-	cd ${WRKSRC} && ${SED} -e s:/usr/lib/X11/Xloadimage:${X11BASE}/lib/X11/app-defaults/Xloadimage: < xloadimage.man |${GZIP_CMD} >${X11BASE}/man/man1/xloadimage.1.gz
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} xloadimage uufilter ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_DATA} xloadimagerc ${PREFIX}/lib/X11/app-defaults/Xloadimage
+	cd ${WRKSRC} && ${SED} -e s:/usr/lib/X11/Xloadimage:${PREFIX}/lib/X11/app-defaults/Xloadimage: < xloadimage.man >${PREFIX}/man/man1/xloadimage.1
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:


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