- Update to version 1.0

PR:		59746
Submitted by:	maintainer

5 files changed, 68 insertions, 29 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 5af316b9ebd0..5e9672856909 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.9.16
+PORTVERSION=	1.0
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
@@ -32,14 +32,15 @@ USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GNOME=	glib12
-USE_LIBTOOL=	yes
+#USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME} \
 		--with-simdir=${PREFIX}/lib/silcsim/client \
 		--with-helpdir=${PREFIX}/share/${PORTNAME}/help \
 		--with-docdir=${PREFIX}/share/doc/silc \
-		--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl
-INSTALLS_SHLIB=	yes
+		--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl \
+		--without-libtoolfix
+#INSTALLS_SHLIB=	yes
 PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
 PLIST_SUB+=	ARCH="${ARCH}-freebsd"
 PKGDEINSTALL=	${PKGINSTALL}
@@ -84,8 +85,8 @@ post-patch:
 	@${PERL} -pi -e 's/--libtool-enable-shared//' \
 		${WRKSRC}/lib/silccrypt/Makefile.in
 
-post-configure:
-	@${CP} ${LIBTOOL} ${WRKSRC}
+#post-configure:
+#	@${CP} ${LIBTOOL} ${WRKSRC}
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index e40e19ebb8df..e9df1ba1573c 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1 +1 @@
-MD5 (silc-client-0.9.16.tar.bz2) = 0a7e6309034f8789beaea2305a4197ef
+MD5 (silc-client-1.0.tar.bz2) = 49075f34f684564c3e84e869fb29c92f
diff --git a/net/silc-client/files/patch-Makefile.in b/net/silc-client/files/patch-Makefile.in
index fa4542ef8663..98fdb85d65e2 100644
--- a/net/silc-client/files/patch-Makefile.in
+++ b/net/silc-client/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Oct 16 00:31:17 2003
-+++ Makefile.in	Thu Oct 16 15:39:51 2003
-@@ -234,7 +234,7 @@
+--- Makefile.in.orig	Thu Nov 27 11:07:16 2003
++++ Makefile.in	Sat Nov 29 01:46:30 2003
+@@ -235,7 +235,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -9,7 +9,20 @@
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -707,17 +707,13 @@
+@@ -270,7 +270,6 @@
+ # Installing of SILC into the system
+ #
+ etcdir = $(DESTDIR)$(silc_etcdir)
+-modulesdir = $(DESTDIR)$(silc_modulesdir)
+ helpdir = $(DESTDIR)$(silc_helpdir)
+ docdir = $(DESTDIR)$(silc_docdir)
+ logsdir = $(DESTDIR)$(silc_logsdir)
+@@ -712,22 +711,17 @@
+ 
+ install-dirs:
+ 	-mkdir -p $(etcdir)
+-	-mkdir -p $(modulesdir)
+ 	-mkdir -p $(docdir)
  
  install-dirs-client: install-dirs
  	-mkdir -p $(helpdir)
@@ -27,7 +40,7 @@
  	-$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	-$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
  	-$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -741,12 +737,8 @@
+@@ -751,12 +745,8 @@
  	fi
  
  etc-install-client:
@@ -41,3 +54,26 @@
  
  etc-install-server:
  	-@if test '!' -f $(etcdir)/silcd.conf ; then \
+@@ -767,9 +757,6 @@
+           chmod go= $(etcdir)/silcd.conf; \
+ 	fi
+ 
+-sim-install:
+-	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
+-
+ toolkit-install:
+ 	-mkdir -p $(docdir)/toolkit/
+ 	-$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
+@@ -786,9 +773,9 @@
+ 	  $(sbindir)/silcd -C $(etcdir); \
+ 	fi
+ 
+-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
++@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client doc-install-client etc-install-client
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server doc-install-server examples-install etc-install-server generate-server-key
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net/silc-client/files/patch-lib-Makefile.in b/net/silc-client/files/patch-lib-Makefile.in
new file mode 100644
index 000000000000..850507b39641
--- /dev/null
+++ b/net/silc-client/files/patch-lib-Makefile.in
@@ -0,0 +1,19 @@
+--- lib/Makefile.in.orig	Thu Nov 27 16:07:17 2003
++++ lib/Makefile.in	Fri Nov 28 15:56:07 2003
+@@ -551,15 +551,8 @@
+ 	-rm -rf libsilcclient.a
+ 
+ @SILC_DIST_TOOLKIT_TRUE@install-exec-hook:
+-@SILC_DIST_TOOLKIT_TRUE@	-mkdir -p $(DESTDIR)$(libdir)
+-@SILC_DIST_TOOLKIT_TRUE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+-@SILC_DIST_TOOLKIT_TRUE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
++
+ @SILC_DIST_TOOLKIT_FALSE@install-exec-hook:
+-@SILC_DIST_TOOLKIT_FALSE@	-mkdir -p $(libdir)
+-@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+-@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
+-@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+-@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
+ 
+ # WIN32 DLL generation
+ @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index 95e4f74370d7..fdf28cbbffa3 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -1,20 +1,5 @@
 bin/silc
 etc/silc/silc.conf.sample
-lib/libsilc-1.0.so.3
-lib/libsilc.la
-lib/libsilc.so
-lib/libsilcclient-1.0.so.2
-lib/libsilcclient.la
-lib/libsilcclient.so
-lib/silcsim/client/aes.sim.so
-lib/silcsim/client/blowfish.sim.so
-lib/silcsim/client/cast.sim.so
-lib/silcsim/client/md5.sim.so
-lib/silcsim/client/none.sim.so
-lib/silcsim/client/rc5.sim.so
-lib/silcsim/client/rsa.sim.so
-lib/silcsim/client/sha1.sim.so
-lib/silcsim/client/twofish.sim.so
 share/silc/help/action
 share/silc/help/admin
 share/silc/help/alias
@@ -138,8 +123,6 @@ lib/silc/perl/%%ARCH%%/Irssi/TextUI.pm
 @dirrm share/silc/scripts
 @dirrm share/silc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/silcsim/client
-@unexec rmdir %D/lib/silcsim 2>/dev/null || true
 @unexec rmdir %D/etc/silc 2>/dev/null || true
 @dirrm lib/silc/perl/%%ARCH%%/auto/Irssi/TextUI
 @dirrm lib/silc/perl/%%ARCH%%/auto/Irssi/UI