From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 16 19:10:22 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 769BA16A421 for ; Sun, 16 Oct 2005 19:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F30FA43D4C for ; Sun, 16 Oct 2005 19:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9GJAHNY090209 for ; Sun, 16 Oct 2005 19:10:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9GJAHXY090208; Sun, 16 Oct 2005 19:10:17 GMT (envelope-from gnats) Resent-Date: Sun, 16 Oct 2005 19:10:17 GMT Resent-Message-Id: <200510161910.j9GJAHXY090208@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58E9016A421 for ; Sun, 16 Oct 2005 19:01:54 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from hfep05.dion.ne.jp (hfep05.dion.ne.jp [203.181.105.71]) by mx1.FreeBSD.org (Postfix) with ESMTP id E367B43D46 for ; Sun, 16 Oct 2005 19:01:53 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([218.222.64.154]) by hfep05.dion.ne.jp with SMTP id <20051016190151509.PSLM@hfep05.dion.ne.jp> for ; Mon, 17 Oct 2005 04:01:51 +0900 Message-Id: <20051017040035.20fb40fc.tkato432@yahoo.com> Date: Mon, 17 Oct 2005 04:00:35 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/87540: Update port: x11/wdm X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Oct 2005 19:10:22 -0000 >Number: 87540 >Category: ports >Synopsis: Update port: x11/wdm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 16 19:10:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p13 i386 >Organization: >Environment: >Description: - Fix MASTER_SITES >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/wdm/Makefile x11/wdm/Makefile --- /usr/ports/x11/wdm/Makefile Sat Oct 15 13:56:30 2005 +++ x11/wdm/Makefile Sat Oct 15 14:54:52 2005 @@ -9,11 +9,13 @@ PORTVERSION= 1.28 PORTREVISION= 1 CATEGORIES= x11 windowmaker -MASTER_SITES= http://voins.program.ru/wdm/ \ - http://www.de.freebsd.org/de/gif/bsd/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= tg -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS} +MASTER_SITES= http://voins.program.ru/wdm/:wdm \ + http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \ + ${MASTER_SITE_LOCAL:S/$/:pic_small/} +MASTER_SITE_SUBDIR= tg/:pic_small +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:wdm \ + beastie.xpm:pic_small \ + daemon1-HQ-1280x960.jpg:pic_large DIST_SUBDIR= wdm EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -30,7 +32,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - DEF_SERVER="${DEF_SERVER}" + DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}" CONFIGURE_ARGS= --with-logdir=/var/log \ --with-runlockdir=/var/run \ --with-wdmdir=${WDMDIR} \ @@ -49,12 +51,10 @@ LDFLAGS= -L${LOCALBASE}/lib -lintl DEF_SERVER?= ${X11BASE}/bin/X +XRDB_PATH?= ${X11BASE}/bin/xrdb -MAKE_ENV= XRDB_PATH=${PREFIX}/bin/xrdb WDMDIR= ${PREFIX}/lib/X11/wdm -DAEMONPICS= beastie.xpm daemon1-HQ-1280x960.jpg - .include .if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM) @@ -106,7 +106,7 @@ .if exists(${WDMDIR}/Xsetup_0.preserve) ${MV} ${WDMDIR}/Xsetup_0.preserve ${WDMDIR}/Xsetup_0 .endif -.for file in ${DAEMONPICS} +.for file in beastie.xpm daemon1-HQ-1280x960.jpg @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WDMDIR}/pixmaps .endfor .if defined(WITH_PAM) >Release-Note: >Audit-Trail: >Unformatted: