From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 8 03:20:24 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 39F1137B405 for ; Sun, 8 Jun 2003 03:20:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DACDA43FB1 for ; Sun, 8 Jun 2003 03:20:19 -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 h58AKJUp056511 for ; Sun, 8 Jun 2003 03:20:19 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h58AKJde056510; Sun, 8 Jun 2003 03:20:19 -0700 (PDT) Resent-Date: Sun, 8 Jun 2003 03:20:19 -0700 (PDT) Resent-Message-Id: <200306081020.h58AKJde056510@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, Yoshihiko Sarumaru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5D6D37B401 for ; Sun, 8 Jun 2003 03:11:53 -0700 (PDT) Received: from flets22-023.kamome.or.jp (yumi.yamayuri.org [218.45.22.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7207F43FAF for ; Sun, 8 Jun 2003 03:11:52 -0700 (PDT) (envelope-from mistral@imasy.or.jp) Received: from shimako.yamayuri.org (shimako.yamayuri.org [IPv6:3ffe:505:2020:0:203:47ff:fe14:7175])h58ABiYM000432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 8 Jun 2003 19:11:44 +0900 (JST) (envelope-from mistral@imasy.or.jp) Received: (from sarumaru@localhost) by shimako.yamayuri.org (8.12.9/8.12.9/Submit) id h587Rp4f056655; Sun, 8 Jun 2003 16:27:51 +0900 (JST) (envelope-from sarumaru) Message-Id: <200306080727.h587Rp4f056655@shimako.yamayuri.org> Date: Sun, 8 Jun 2003 16:27:51 +0900 (JST) From: Yoshihiko Sarumaru To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53042: Update port: net/stone upgrade 2.1d -> 2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Yoshihiko Sarumaru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 10:20:24 -0000 >Number: 53042 >Category: ports >Synopsis: Update port: net/stone upgrade 2.1d -> 2.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jun 08 03:20:19 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Yoshihiko Sarumaru >Release: FreeBSD 4.8-STABLE i386 >Organization: Internet Mutual Aid Society Yokohama >Environment: System: FreeBSD shimako.yamayuri.org 4.8-STABLE FreeBSD 4.8-STABLE #10: Fri May 23 01:08:36 JST 2003 sarumaru@shimako.yamayuri.org:/usr/obj/usr/src/sys/Z505VRK i386 >Description: This PR upgrade net/stone from 2.1d to 2.2. >How-To-Repeat: >Fix: - remove entire "files/" directory. - update distinfo (apply patch) - update Makefile (apply patch) diff -ur stone.bak/Makefile stone/Makefile --- stone.bak/Makefile Tue Feb 25 00:57:12 2003 +++ stone/Makefile Sun Jun 8 16:07:14 2003 @@ -6,7 +6,7 @@ # PORTNAME= stone -PORTVERSION= 2.1d +PORTVERSION= 2.2 CATEGORIES= net MASTER_SITES= http://www.gcd.org/sengoku/stone/ @@ -16,18 +16,31 @@ MAN1= ${PORTNAME}.1 MANLANG= "" ja -.include +USE_REINPLACE= yes -pre-patch: -.if exists(/usr/bin/openssl) +.if exists(${PREFIX}/lib/libssl.so) ALL_TARGET= bsd-ssl -EXTRA_PATCHES= ${FILESDIR}/base.patch -.elif exists(${PREFIX}/bin/openssl) +MAKE_ARGS= -e SSL_FLAGS="-DUSE_SSL -I${PREFIX}/include" SSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto" +.elif exists(/usr/lib/libssl.so) ALL_TARGET= bsd-ssl -EXTRA_PATCHES= ${FILESDIR}/ports.patch +MAKE_ARGS= -e SSL_FLAGS="-DUSE_SSL" SSL_LIBS="-lssl -lcrypto" .else ALL_TARGET= bsd-pop - @${ECHO} "You can build stone with SSL support by installing OpenSSL." +MAKE_ARGS= -e POP_LIBS="-lmd" +NEED_GLOBAL_H= yes +.endif + +pre-everything:: +.if ${ALL_TARGET} != bsd-ssl + @${ECHO_CMD} "You can build stone with SSL support by installing OpenSSL." +.endif + +pre-patch: + ${REINPLACE_CMD} -e "s/-D_THREAD_SAFE/${PTHREAD_CFLAGS}/g;s/-pthread/${PTHREAD_LIBS}/g" ${WRKSRC}/Makefile + +pre-build: +.if defined(NEED_GLOBAL_H) + ${TOUCH} ${WRKSRC}/global.h .endif do-install: @@ -35,4 +48,5 @@ ${INSTALL_MAN} ${WRKSRC}/stone.1 ${PREFIX}/man/man1/stone.1 ${INSTALL_MAN} ${WRKSRC}/stone.1.ja ${PREFIX}/man/ja/man1/stone.1 -.include +#.include +.include diff -ur stone.bak/distinfo stone/distinfo --- stone.bak/distinfo Tue Jun 19 15:25:07 2001 +++ stone/distinfo Thu May 29 14:18:07 2003 @@ -1 +1 @@ -MD5 (stone-2.1d.tar.gz) = cc1bb4518fde5a5b843933c239248e97 +MD5 (stone-2.2.tar.gz) = 70ae17e2d9a5d9310177468475554c23 Only in stone.bak/: files >Release-Note: >Audit-Trail: >Unformatted: