Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Oct 2005 04:00:35 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/87540: Update port: x11/wdm
Message-ID:  <20051017040035.20fb40fc.tkato432@yahoo.com>
Resent-Message-ID: <200510161910.j9GJAHXY090208@freefall.freebsd.org>

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

>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 <bsd.port.pre.mk>
 
 .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:



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