7 files changed, 25 insertions, 102 deletions
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 78fd4db5bdb..ac23ab209d5 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/12/29 15:42:37 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2005/04/08 15:09:43 salo Exp $
 #
 
-DISTNAME=		silc-server-0.9.18
-PKGREVISION=		3
+DISTNAME=		silc-server-0.9.19p1
+PKGNAME=		${DISTNAME:S/p1/.1/}
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -20,6 +20,7 @@ USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	libtool */*/*/libtool
+WRKSRC=			${WRKDIR}/${DISTNAME:S/p1//}
 
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
@@ -67,20 +68,12 @@ CONFIGURE_ARGS+=	--without-libtoolfix
 #
 CONFIGURE_ENV+=		F77=${FALSE}
 
-BUILD_DEFS+=		USE_INET6
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-# If you want to debug silc-server, uncomment the line below.
-#
-#CONFIGURE_ARGS+=       --enable-debug
-
 .if ${MACHINE_ARCH} != "i386"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
+.include "options.mk"
+
 post-install:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \
 		> ${EGDIR}/motd.txt.default
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index 6849834ab43..b3dbcb2d4ca 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.26 2005/02/23 15:59:13 agc Exp $
+$NetBSD: distinfo,v 1.27 2005/04/08 15:09:43 salo Exp $
 
-SHA1 (silc-server-0.9.18.tar.bz2) = 232f10fc0f587b8028346bacf80d11443c4792c8
-RMD160 (silc-server-0.9.18.tar.bz2) = 64a155e8d5a74888b627dc041cfdb98c93da7ac1
-Size (silc-server-0.9.18.tar.bz2) = 1169331 bytes
+SHA1 (silc-server-0.9.19p1.tar.bz2) = 5ef4c79aafe668efb31ab7f11cbdfdfdae1b7754
+RMD160 (silc-server-0.9.19p1.tar.bz2) = 24e72b8e5c833da1b21dcdbc63aef2a5d2bdcadb
+Size (silc-server-0.9.19p1.tar.bz2) = 1182404 bytes
 SHA1 (patch-aa) = 181bf9a721abaeaaa0afd7e24017cd49a8020ac4
 SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18
-SHA1 (patch-ac) = a265c4d5f98e0dc10080fbcc29a9c0c43659907d
-SHA1 (patch-ad) = 9511132935ecc38e6192458e61e2445a381f0ea4
-SHA1 (patch-ae) = c4d1e29691dc993a5d27b3b8242e0bb4ae4dc018
-SHA1 (patch-af) = 7ae691611573c355c401863e621435675df9cae3
diff --git a/chat/silc-server/options.mk b/chat/silc-server/options.mk
new file mode 100644
index 00000000000..5af335ff79d
--- /dev/null
+++ b/chat/silc-server/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2005/04/08 15:09:43 salo Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-server
+PKG_SUPPORTED_OPTIONS=	debug inet6
+PKG_DEFAULT_OPTIONS=	inet6
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac
deleted file mode 100644
index 0c385bf82a2..00000000000
--- a/chat/silc-server/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2004/06/11 10:05:06 salo Exp $
-
---- lib/contrib/Makefile.in.orig	2004-02-29 16:10:01.000000000 +0100
-+++ lib/contrib/Makefile.in	2004-06-11 11:31:45.000000000 +0200
-@@ -287,7 +298,9 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
--noinst_LTLIBRARIES = libcontrib.la
-+@HAVE_GETOPT_LONG_FALSE@noinst_LTLIBRARIES = libcontrib.la
-+@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_FALSE@noinst_LTLIBRARIES = libcontrib.la
-+@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_TRUE@noinst_LTLIBRARIES = 
- @HAVE_GETOPT_LONG_FALSE@GETOPT = getopt.c getopt1.c
- @HAVE_GETOPT_LONG_TRUE@GETOPT = 
- @HAVE_REGEX_FALSE@REGEX = regex.c
diff --git a/chat/silc-server/patches/patch-ad b/chat/silc-server/patches/patch-ad
deleted file mode 100644
index fdcf65c7918..00000000000
--- a/chat/silc-server/patches/patch-ad
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2004/06/11 10:05:06 salo Exp $
-
---- configure.orig	Wed Jan 14 14:28:30 2004
-+++ configure	Wed Jun  9 10:22:17 2004
-@@ -10456,9 +10456,16 @@
- 
- fi
- if test $ac_cv_header_regex_h = yes; then
-+
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_REGEX 1
-+_ACEOF
-+
-   have_regex=1
-+
- else
-   have_regex=0
-+
- fi
- 
- 
-@@ -10563,9 +10570,16 @@
- echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
- echo "${ECHO_T}$ac_cv_func_getopt_long" >&6
- if test $ac_cv_func_getopt_long = yes; then
-+
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GETOPT_LONG 1
-+_ACEOF
-+
-   have_getopt_long=1
-+
- else
-   have_getopt_long=0
-+
- fi
- 
- 
diff --git a/chat/silc-server/patches/patch-ae b/chat/silc-server/patches/patch-ae
deleted file mode 100644
index f503666cf2c..00000000000
--- a/chat/silc-server/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/06/11 10:05:06 salo Exp $
-
---- includes/silcdefs.h.in.orig	Wed Jan 14 14:33:17 2004
-+++ includes/silcdefs.h.in	Wed Jun  9 10:22:31 2004
-@@ -42,6 +42,10 @@
- #undef SILC_MP_GMP
- #undef SILC_MP_NSS_MPI
- 
-+/* contrib library */
-+#undef HAVE_REGEX
-+#undef HAVE_GETOPT_LONG
-+
- /* Redefs for SOCKS5 library */
- /* macros/curses checks */
- #undef HAS_CURSES
diff --git a/chat/silc-server/patches/patch-af b/chat/silc-server/patches/patch-af
deleted file mode 100644
index 665fb4330db..00000000000
--- a/chat/silc-server/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/07/12 21:40:02 salo Exp $
-
---- silcd/route.h.orig	Mon Mar  3 17:56:04 2003
-+++ silcd/route.h	Mon Jul 12 23:27:35 2004
-@@ -54,7 +54,7 @@
- /* Returns route cache hash table entry index. This is IPv4 specific.
-    `port' argument may be zero (0) if it doesn't exist.  This has been
-    taken from Linux kernel's route cache code. */
--extern inline
-+static inline
- SilcUInt32 silc_server_route_hash(unsigned int addr, 
- 				    SilcUInt16 port)
- {