From owner-freebsd-ports Fri Jun 1 15:50:11 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 267D837B42C for ; Fri, 1 Jun 2001 15:50:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f51Mo1a43363; Fri, 1 Jun 2001 15:50:01 -0700 (PDT) (envelope-from gnats) Received: from gamera.ecs.csus.edu (gamera.ecs.csus.edu [130.86.75.166]) by hub.freebsd.org (Postfix) with ESMTP id 3BEF937B423; Fri, 1 Jun 2001 15:47:54 -0700 (PDT) (envelope-from scottj@gamera.ecs.csus.edu) Received: (from root@localhost) by gamera.ecs.csus.edu (8.11.3/8.11.3) id f51Mm1205808; Fri, 1 Jun 2001 15:48:01 -0700 (PDT) (envelope-from scottj) Message-Id: <200106012248.f51Mm1205808@gamera.ecs.csus.edu> Date: Fri, 1 Jun 2001 15:48:01 -0700 (PDT) From: joseph@randomnetworks.com Reply-To: joseph@randomnetworks.com To: FreeBSD-gnats-submit@freebsd.org Cc: torstenb@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/27825: MASTER_SITES update : x11-wm/ctwm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 27825 >Category: ports >Synopsis: MASTER_SITES update : x11-wm/ctwm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 01 15:50:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Joseph Scott >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: System: FreeBSD gamera.ecs.csus.edu 4.3-STABLE FreeBSD 4.3-STABLE #0: Fri May 18 11:34:37 PDT 2001 root@gamera.ecs.csus.edu:/usr/obj/usr/src/sys/GAMERA i386 >Description: According to http://people.freebsd.org/~fenner/portsurvey/x11-wm.html#ctwm the port x11-wm/ctwm has unfetchable distfiles. I found the new site that is hosting them. NOTE : the maintainer, torstenb@freebsd.org has been CC'd as part of this pr. Issues with this port and this diff : 1. There appears to only be one distfile instead of two. 2. The PORTVERSION went from 3.5.2b to 3.5.2, which seems backwards to me. 3. The post-extract rule was causing the install to fail, so I removed it. 4. I'm not real confident that this port is PREFIX/X11BASE clean, but I'm not in the mood to fix that right now. >How-To-Repeat: >Fix: diff -ruN ctwm.orig/Makefile ctwm/Makefile --- ctwm.orig/Makefile Fri Jun 1 15:12:42 2001 +++ ctwm/Makefile Fri Jun 1 15:42:12 2001 @@ -6,10 +6,9 @@ # PORTNAME= ctwm -PORTVERSION= 3.5.2b +PORTVERSION= 3.5.2 CATEGORIES= x11-wm -MASTER_SITES= ftp://slhp1.epfl.ch/pub/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX} +MASTER_SITES= http://ctwm.dl.nu/ MAINTAINER= torstenb@FreeBSD.org @@ -21,8 +20,5 @@ USE_IMAKE= yes USE_XPM= yes MAN1= ctwm.1 - -post-extract: - @(cd ${WRKSRC} && ${LN} -s ../xpm xpm) .include diff -ruN ctwm.orig/distinfo ctwm/distinfo --- ctwm.orig/distinfo Fri Jun 1 15:12:42 2001 +++ ctwm/distinfo Fri Jun 1 15:19:41 2001 @@ -1,2 +1 @@ -MD5 (ctwm-3.5.2b.tar.gz) = 7a77c6669ade274631d65d25537c9bd1 -MD5 (ctwm-images.tar.gz) = 4b0c784213af4afa2d736773863e53b4 +MD5 (ctwm-3.5.2.tar.gz) = 2e17ac147b0168df6b0fd06d76df5b6a diff -ruN ctwm.orig/files/patch-ab ctwm/files/patch-ab --- ctwm.orig/files/patch-ab Fri Jun 1 15:12:42 2001 +++ ctwm/files/patch-ab Fri Jun 1 15:25:31 2001 @@ -1,19 +1,11 @@ -*** parse.c.orig Sun Feb 13 19:00:24 2000 ---- parse.c Sun Feb 13 19:02:13 2000 -*************** -*** 2070,2076 **** - dup2(fids[1], 1); /* stdout = pipe to parent */ - /* get_defs("m4", dpy, display_name) */ - tmp_file = m4_defs(dpy, display_name); -! execlp("m4", "m4", "-s", tmp_file, "-", NULL); - /* If we get here we are screwed... */ - perror("Can't execlp() m4"); - exit(124); ---- 2070,2076 ---- - dup2(fids[1], 1); /* stdout = pipe to parent */ - /* get_defs("m4", dpy, display_name) */ - tmp_file = m4_defs(dpy, display_name); -! execlp(M4PROG, "-s", tmp_file, "-", NULL); - /* If we get here we are screwed... */ - perror("Can't execlp() m4"); - exit(124); +--- parse.c.orig Tue Sep 14 06:26:30 1999 ++++ parse.c Fri Jun 1 15:24:44 2001 +@@ -2027,7 +2027,7 @@ + dup2(fids[1], 1); /* stdout = pipe to parent */ + /* get_defs("m4", dpy, display_name) */ + tmp_file = m4_defs(dpy, display_name); +- execlp("m4", "m4", tmp_file, "-", NULL); ++ execlp(M4PROG, "-s", tmp_file, "-", NULL); + /* If we get here we are screwed... */ + perror("Can't execlp() m4"); + exit(124); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message