5 files changed, 44 insertions, 31 deletions

diff --git a/irc/sircd/Makefile b/irc/sircd/Makefile
index 2418dbe7ac62..cf59e82854ec 100644
--- a/irc/sircd/Makefile
+++ b/irc/sircd/Makefile
@@ -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 --git a/irc/sircd/distinfo b/irc/sircd/distinfo
index aff1e29dcd6a..fd707b65ed4b 100644
--- a/irc/sircd/distinfo
+++ b/irc/sircd/distinfo
@@ -1 +1 @@
-MD5 (sircd-0.2.5-alpha.tar.gz) = 001aef9c4e700a240a503f01d351b746
+MD5 (sircd-0.4.0.tar.gz) = cf5d230741e221bd48797eda373d0468
diff --git a/irc/sircd/files/patch-Makefile b/irc/sircd/files/patch-Makefile
new file mode 100644
index 000000000000..3d1a16bc1470
--- /dev/null
+++ b/irc/sircd/files/patch-Makefile
@@ -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 --git a/irc/sircd/files/patch-sircd::src::srv_commands.c b/irc/sircd/files/patch-sircd::src::srv_commands.c
deleted file mode 100644
index 640343412e0f..000000000000
--- a/irc/sircd/files/patch-sircd::src::srv_commands.c
+++ /dev/null
@@ -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 --git a/irc/sircd/pkg-plist b/irc/sircd/pkg-plist
index a90812c36e7d..8aba10a6b570 100644
--- a/irc/sircd/pkg-plist
+++ b/irc/sircd/pkg-plist
@@ -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