From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 29 01:40:11 2003 Return-Path: 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 4518237B401 for ; Tue, 29 Jul 2003 01:40:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 020D543F85 for ; Tue, 29 Jul 2003 01:40:09 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h6T8e9Up000665 for ; Tue, 29 Jul 2003 01:40:09 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h6T8e9eu000664; Tue, 29 Jul 2003 01:40:09 -0700 (PDT) Resent-Date: Tue, 29 Jul 2003 01:40:09 -0700 (PDT) Resent-Message-Id: <200307290840.h6T8e9eu000664@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, "Kang Liu" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B00F737B401; Tue, 29 Jul 2003 01:38:48 -0700 (PDT) Received: from hotmail.com (bay8-f20.bay8.hotmail.com [64.4.27.20]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2755D43F75; Tue, 29 Jul 2003 01:38:48 -0700 (PDT) (envelope-from lazykang@hotmail.com) Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Tue, 29 Jul 2003 01:38:48 -0700 Received: from 218.107.145.116 by by8fd.bay8.hotmail.msn.com with HTTP; Tue, 29 Jul 2003 08:38:47 GMT Message-Id: Date: Tue, 29 Jul 2003 16:38:47 +0800 From: "Kang Liu" To: FreeBSD-gnats-submit@FreeBSD.org cc: kris@FreeBSD.org cc: leeym@FreeBSD.org Subject: ports/55005: [PATCH]fix patch error in ports/chinese/telnet X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2003 08:40:11 -0000 >Number: 55005 >Category: ports >Synopsis: fix patch error in ports/chinese/telnet >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jul 29 01:40:09 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Kang Liu >Release: FreeBSD 5.1-CURRENT i386 >Organization: Beijing University of Technology >Environment: System: FreeBSD testipfw.bjpu.edu.cn 5.1-CURRENT FreeBSD 5.1-CURRENT #5: Mon Jul 28 12:27:31 CST 2003 root@testipfw.bjpu.edu.cn:/usr/obj/usr/src/sys/IPFW i386 >Description: ports/chinese/telnet is marked as broken(Fails to patch) now. It is because the path of telnet's sourcecode is different in 5.1-current and 4.x-stable The old ports is made for 4.x-stable, so it can not be compiled on 5.1-current. >How-To-Repeat: just run make in ports/chinese/telnet >Fix: I've test this patch on both 5.1-current and 4.8-stable --- Makefile.orig Tue Jul 29 16:15:37 2003 +++ Makefile Tue Jul 29 16:15:40 2003 @@ -7,6 +7,7 @@ PORTNAME= telnet PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= chinese MASTER_SITES= # none DISTFILES= # none @@ -14,31 +15,54 @@ MAINTAINER= leeym@FreeBSD.org COMMENT= 8bit compatible telnet client for Chinese input -BROKEN= "Fails to patch" - -SRCDIR= /usr/src/usr.bin/telnet +SRCDIR= /usr/src/contrib/telnet/telnet USE_REINPLACE= yes MAN1= zh-telnet.1 +.include +.if ${OSVERSION} < 500000 +SRCDIR=/usr/src/usr.bin/telnet +.endif + do-extract: .if exists (${SRCDIR}) @${MKDIR} ${WRKDIR} @${CP} -R ${SRCDIR} ${WRKSRC} +.if ${OSVERSION} < 500000 @${MKDIR} ${WRKSRC}/lib - @${CP} -R /usr/src/lib/libtelnet ${WRKSRC}/lib + @${CP} -R ${SRCDIR}/../../lib/libtelnet ${WRKSRC}/lib +.else + @${CP} -R ${SRCDIR}/../libtelnet ${WRKSRC} + @${CP} ${SRCDIR}/../arpa/telnet.h ${WRKSRC}/libtelnet + @${CP} -R ${SRCDIR}/../../../usr.bin/telnet/Makefile ${WRKSRC} + @${CP} -R ${SRCDIR}/../../../lib/libtelnet/Makefile ${WRKSRC}/libtelnet +.endif .else IGNORE= "You need to build this port with ${SRCDIR}" .endif pre-patch: +.if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's,/../..,,g' ${WRKSRC}/Makefile +.else + @${REINPLACE_CMD} -e 's,/../../contrib/telnet,,g' ${WRKSRC}/libtelnet/Makefile + @${REINPLACE_CMD} -e 's,../../lib/,,g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's,/../../contrib/telnet,,g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's,${TELNETDIR}/telnet,${TELNETDIR},g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's,/arpa,,g' ${WRKSRC}/libtelnet/Makefile +.endif + pre-build: +.if ${OSVERSION} < 500000 @cd ${WRKSRC}/lib/libtelnet && ${MAKE} +.else + @cd ${WRKSRC}/libtelnet && ${MAKE} +.endif do-install: @${INSTALL_PROGRAM} ${WRKSRC}/telnet ${PREFIX}/bin/zh-telnet @${INSTALL_MAN} ${WRKSRC}/telnet.1 ${PREFIX}/man/man1/${MAN1} -.include +.include _________________________________________________________________ The new MSN 8: smart spam protection and 2 months FREE* http://join.msn.com/?page=features/junkmail >Release-Note: >Audit-Trail: >Unformatted: