Attachment 24237 Details for Bug 41504 – file.diff

[patch] file.diff

file.diff (text/plain), 3.67 KB, created by tkato on 2002-08-10 04:52:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-08-10 04:52:52 UTC

Size: 3.67 KB

patch

obsolete

>diff -urN /usr/ports/irc/sircd/Makefile irc/sircd/Makefile
>--- /usr/ports/irc/sircd/Makefile	Fri Aug 24 23:15:40 2001
>+++ irc/sircd/Makefile	Thu Aug  8 03:58:58 2002
>@@ -7,32 +7,29 @@
> #
> 
> PORTNAME=	sircd
>-PORTVERSION=	0.2.5a
>+PORTVERSION=	0.4.0
> CATEGORIES=	irc
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		http://www.sircd.org/files/
> MASTER_SITE_SUBDIR=	${PORTNAME}
>-DISTNAME=	${PORTNAME}-${PORTVERSION:S/a/-alpha/}
> 
> MAINTAINER=	ports@FreeBSD.org
> 
> USE_OPENSSL=	yes
>-WRKSRC=		${WRKDIR}/${DISTNAME}/server
> USE_GMAKE=	yes
>+MAKE_ENV=	LD="${CC}" \
>+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>+		PTHREAD_LIBS="${PTHREAD_LIBS}"
> ALL_TARGET=	release
> INSTALLS_SHLIB=	yes
> 
>-post-patch:
>-	@${PERL} -pi -e "s,-lssl,-lssl -lcrypto,g" ${WRKSRC}/sircd/Makefile
>-
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/sircd/sircd ${PREFIX}/sbin
>-	${INSTALL} ${WRKSRC}/../syscore/libsyscore.so ${PREFIX}/lib
>+	${INSTALL_PROGRAM} ${WRKSRC}/sircd/sircd ${PREFIX}/sbin/sircd
> 	${INSTALL_DATA} ${WRKSRC}/sircd/sircd.conf ${PREFIX}/etc/sircd.conf.sample
>-	${MKDIR} ${PREFIX}/share/sircd/plugins
>-.for file in mod_base.so mod_oper.so
>-	${INSTALL} ${WRKSRC}/plugins/${file} ${PREFIX}/share/sircd/plugins
>-.endfor
>-	${INSTALL_DATA} ${WRKSRC}/sircd/motd.txt ${PREFIX}/share/sircd
>+	${INSTALL_DATA} ${WRKSRC}/syscore/libsyscore.so ${PREFIX}/lib/libsyscore.so
>+	@${MKDIR} ${PREFIX}/lib/sircd
>+	${INSTALL_DATA} ${WRKSRC}/sircd/motd.txt ${PREFIX}/lib/sircd/motd.txt
>+	@${MKDIR} ${PREFIX}/lib/sircd/plugins
>+	${INSTALL_DATA} ${WRKSRC}/plugins/*.so ${PREFIX}/lib/sircd/plugins
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/irc/sircd/distinfo irc/sircd/distinfo
>--- /usr/ports/irc/sircd/distinfo	Fri Aug 24 23:15:40 2001
>+++ irc/sircd/distinfo	Thu Aug  8 02:41:04 2002
>@@ -1 +1 @@
>-MD5 (sircd-0.2.5-alpha.tar.gz) = 001aef9c4e700a240a503f01d351b746
>+MD5 (sircd-0.4.0.tar.gz) = cf5d230741e221bd48797eda373d0468
>diff -urN /usr/ports/irc/sircd/files/patch-Makefile irc/sircd/files/patch-Makefile
>--- /usr/ports/irc/sircd/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ irc/sircd/files/patch-Makefile	Thu Aug  8 03:02:49 2002
>@@ -0,0 +1,26 @@
>+--- Makefile.orig	Sun Feb  3 02:44:49 2002
>++++ Makefile	Thu Aug  8 02:50:28 2002
>+@@ -31,10 +31,10 @@
>+ ## 
>+ 
>+ # Default (Linux / BSD)
>+-CC       = gcc -pthread
>+-LD       = gcc
>+-XLIBS    = -lpthread
>+-RFLAGS   = -march=i686
>++#CC       = gcc -pthread
>++#LD       = gcc
>++XLIBS    = ${PTHREAD_LIBS}
>++RFLAGS   = ${PTHREAD_CFLAGS}
>+ SHFLAGS  = -fPIC
>+ 
>+ # Solaris (SPARC)
>+@@ -56,7 +56,7 @@
>+ # Release Flags
>+ ##
>+ 
>+-RFLAGS += -O3 -fomit-frame-pointer
>++RFLAGS += ${CFLAGS}
>+ RFLAGS += -DNDEBUG -D_REENTRANT
>+ 
>+ ##
>diff -urN /usr/ports/irc/sircd/files/patch-sircd::src::srv_commands.c irc/sircd/files/patch-sircd::src::srv_commands.c
>--- /usr/ports/irc/sircd/files/patch-sircd::src::srv_commands.c	Fri Aug 24 23:15:40 2001
>+++ irc/sircd/files/patch-sircd::src::srv_commands.c	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- sircd/src/srv_commands.c.orig	Fri Jun 15 16:10:36 2001
>-+++ sircd/src/srv_commands.c	Fri Jun 15 16:11:25 2001
>-@@ -11,6 +11,8 @@
>- */
>- 
>- #include <srv_include.h>
>-+#include <sys/types.h>
>-+#include <sys/stat.h>
>- 
>- #ifdef WIN32
>- 	#pragma warning(disable : 4090)	// const
>diff -urN /usr/ports/irc/sircd/pkg-plist irc/sircd/pkg-plist
>--- /usr/ports/irc/sircd/pkg-plist	Fri Aug 24 23:15:40 2001
>+++ irc/sircd/pkg-plist	Thu Aug  8 03:53:32 2002
>@@ -1,8 +1,9 @@
> sbin/sircd
>-lib/libsyscore.so
> etc/sircd.conf.sample
>-share/sircd/motd.txt
>-share/sircd/plugins/mod_base.so
>-share/sircd/plugins/mod_oper.so
>-@dirrm share/sircd/plugins
>-@dirrm share/sircd
>+lib/libsyscore.so
>+lib/sircd/motd.txt
>+lib/sircd/plugins/cl_base.so
>+lib/sircd/plugins/cl_oper.so
>+lib/sircd/plugins/sv_base.so
>+@dirrm lib/sircd/plugins
>+@dirrm lib/sircd

Actions: View | Diff

Attachments on bug 41504: 24237