ports/53042: Update port: net/stone upgrade 2.1d -> 2.2

[Yoshihiko Sarumaru]

>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 at 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 <bsd.port.pre.mk>
+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 <bsd.port.post.mk>
+#.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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: