From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 14 20:30:19 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 F0B0E16A41F for ; Mon, 14 Nov 2005 20:30:19 +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 A2AB743D78 for ; Mon, 14 Nov 2005 20:30:10 +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 jAEKUA1U070020 for ; Mon, 14 Nov 2005 20:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAEKUAQA070016; Mon, 14 Nov 2005 20:30:10 GMT (envelope-from gnats) Resent-Date: Mon, 14 Nov 2005 20:30:10 GMT Resent-Message-Id: <200511142030.jAEKUAQA070016@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, "Boris B. Samorodov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD2A016A41F for ; Mon, 14 Nov 2005 20:23:53 +0000 (GMT) (envelope-from bsam@mi.ipt.ru) Received: from mi.ipt.ru (gw.ipt.ru [80.253.10.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E15543D7B for ; Mon, 14 Nov 2005 20:23:43 +0000 (GMT) (envelope-from bsam@mi.ipt.ru) Received: from mi.ipt.ru (localhost [127.0.0.1]) by mi.ipt.ru (8.13.4/8.13.4) with ESMTP id jAEKMtLf020204 for ; Mon, 14 Nov 2005 23:22:55 +0300 (MSK) (envelope-from bsam@mi.ipt.ru) Received: (from bsam@localhost) by mi.ipt.ru (8.13.4/8.13.3/Submit) id jAEKMtJK020203; Mon, 14 Nov 2005 23:22:55 +0300 (MSK) (envelope-from bsam) Message-Id: <200511142022.jAEKMtJK020203@mi.ipt.ru> Date: Mon, 14 Nov 2005 23:22:55 +0300 (MSK) From: "Boris B. Samorodov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89029: [maintainer-update] sysutils/mapchan: take maintainership, update to new version 2.0, unbreak fetching X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Boris B. Samorodov" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Nov 2005 20:30:20 -0000 >Number: 89029 >Category: ports >Synopsis: [maintainer-update] sysutils/mapchan: take maintainership, update to new version 2.0, unbreak fetching >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Nov 14 20:30:10 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Boris B. Samorodov >Release: FreeBSD 6.0-STABLE i386 >Organization: InPharmTech, Co. http://www.ipt.ru >Environment: System: FreeBSD mi.ipt.ru 6.0-STABLE FreeBSD 6.0-STABLE #0: Wed Nov 2 17:58:38 MSK 2005 bsam@mi.ipt.ru:/usr/obj/usr/src/sys/PROBA1 i386 >Description: 1. Take maintainership. 2. Update to new version 2.0. 3. Unbreak fetching. 4. Undeprecate the port. ;-) >How-To-Repeat: >Fix: The patch is relative to the port: # cd /usr/ports/sysutils # patch -p0 < _the_patch_ --- mapchan.patch begins here --- diff -ruN mapchan.orig/Makefile mapchan/Makefile --- mapchan.orig/Makefile Mon Nov 14 22:33:38 2005 +++ mapchan/Makefile Mon Nov 14 23:12:57 2005 @@ -6,16 +6,12 @@ # PORTNAME= mapchan -PORTVERSION= 1.4 +PORTVERSION= 2.0 CATEGORIES= sysutils converters MASTER_SITES= http://www.iceb.vinnitsa.com/download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bsam@ipt.ru COMMENT= Implementation of the utility "mapchan" from SCO Unix - -BROKEN= "1.4 is unfetchable but 2.0 is available from the site" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2005-12-09 USE_BZIP2= yes USE_REINPLACE= yes diff -ruN mapchan.orig/distinfo mapchan/distinfo --- mapchan.orig/distinfo Mon Nov 14 22:33:38 2005 +++ mapchan/distinfo Mon Nov 14 23:07:35 2005 @@ -1 +1,3 @@ -MD5 (mapchan-1.4.tar.bz2) = 3dc874899b0e00e298f0f1b1a5622993 +MD5 (mapchan-2.0.tar.bz2) = b0a889deafc4b2fdd9658a038bb13e13 +SHA256 (mapchan-2.0.tar.bz2) = 348b202db14bf200b02d4b18c20b6e059db457e47b5b567eaa7af161045f50d6 +SIZE (mapchan-2.0.tar.bz2) = 22547 diff -ruN mapchan.orig/files/patch-Makefile mapchan/files/patch-Makefile --- mapchan.orig/files/patch-Makefile Mon Nov 14 22:33:38 2005 +++ mapchan/files/patch-Makefile Mon Nov 14 23:07:35 2005 @@ -1,11 +1,23 @@ ---- Makefile.orig Sat Dec 23 09:47:25 2000 -+++ Makefile Thu Aug 7 00:43:27 2003 -@@ -11,7 +11,7 @@ - # (2) If your system has not basename() function - uncomment next string - #DEFS+=-DNOBASENAME - --BINDIR=/bin -+BINDIR=$(PREFIX)/bin - LDFLAGS=-lutil +--- Makefile.orig Wed Jul 6 00:16:36 2005 ++++ Makefile Mon Nov 14 22:52:35 2005 +@@ -1,6 +1,6 @@ + # + # +-CFLAGS=-O2 ++CFLAGS?=$(CFLAGS) + # + # Defines: + #DEFS= +@@ -14,9 +14,9 @@ + # (3) If need call /bin/sh for parsing argument of option -s + DEFS+=-DEXEC_SHELL + +-BINDIR ?= /bin +-MAPDIR ?= /etc/mapchan +-LDFLAGS=-s ++BINDIR?=$(PREFIX)/bin ++MAPDIR?=$(PREFIX)/mapchan ++LDFLAGS=-s -lutil + LOADLIBES=-lutil #-------------------------------------------------------------- CFLAGS += $(DEFS) diff -ruN mapchan.orig/files/patch-mapchan.c mapchan/files/patch-mapchan.c --- mapchan.orig/files/patch-mapchan.c Mon Nov 14 22:33:38 2005 +++ mapchan/files/patch-mapchan.c Mon Nov 14 23:07:35 2005 @@ -9,17 +9,3 @@ #endif #define BUFSIZE 4096 -@@ -51,10 +51,10 @@ - - char usage[] = { "\nUsage:\n\nmapchan [-q] [-s shell] [-f file]\ - [-h]\n\nwhere:\n\ --\tshell - shell, if not /bin/sh -+\tshell - shell, if not /bin/sh\n\ - \tfile - input file\n\ --\t-q - force and quiet --\t-h - print this screen and exit.\n" }; -+\t-q - force and quiet\n\ -+\t-h - print this screen and exit.\n" }; - - int pty_fd; /* дескриптор master */ - int tty_fd; /* дескриптор slave */ diff -ruN mapchan.orig/pkg-plist mapchan/pkg-plist --- mapchan.orig/pkg-plist Mon Nov 14 22:33:38 2005 +++ mapchan/pkg-plist Mon Nov 14 23:07:35 2005 @@ -2,9 +2,13 @@ etc/mapchan/altkoi.map etc/mapchan/default.sample etc/mapchan/dos2koi.map +etc/mapchan/dos2koi-kbd.map etc/mapchan/k180.map +etc/mapchan/koi2win.map etc/mapchan/koiualt.map etc/mapchan/koiumain.map +etc/mapchan/msm.map +etc/mapchan/trivial.map etc/mapchan/sm7238.map etc/mapchan/win2koi.map @unexec rmdir %D/etc/mapchan 2>/dev/null || true --- mapchan.patch ends here --- WBR -- bsam >Release-Note: >Audit-Trail: >Unformatted: