upgrade to silc-client 0.9.12.1
This commit is contained in:
brad
parent
d2aab96ffc
commit
2965814c70
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2003/02/02 20:29:37 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2003/04/18 03:22:23 brad Exp $
|
||||
|
||||
COMMENT= "Secure Live Internet Conferencing (SILC) client"
|
||||
COMMENT= "Secure Internet Live Conferencing (SILC) client"
|
||||
|
||||
DISTNAME= silc-client-0.9.11
|
||||
DISTNAME= silc-client-0.9.12.1
|
||||
CATEGORIES= net
|
||||
HOMEPAGE= http://www.silcnet.org/
|
||||
|
||||
@ -32,7 +32,8 @@ MODULES= iconv
|
||||
PATCH_LIST= gcc-* patch-*
|
||||
.endif
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_STYLE= autoconf
|
||||
AUTOCONF_VERSION= 2.52
|
||||
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/irssi ${WRKSRC}/lib/silcmath/mpi
|
||||
CONFIGURE_ARGS= --enable-ipv6 \
|
||||
--with-helpdir=${PREFIX}/share/silc/help \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (silc-client-0.9.11.tar.gz) = 4f467bee7ea855a146f75a2b13855961
|
||||
RMD160 (silc-client-0.9.11.tar.gz) = e399ac262ac2163241ff92ace80e3b2fe6b8fc6d
|
||||
SHA1 (silc-client-0.9.11.tar.gz) = cbf40dff4fe7d00cc36433cf5869f54575c341ea
|
||||
MD5 (silc-client-0.9.12.1.tar.gz) = d23496c41f2f95fc9e79fc78de6383ff
|
||||
RMD160 (silc-client-0.9.12.1.tar.gz) = d13365a6fae6515e18e822fdf1a313121d89abe4
|
||||
SHA1 (silc-client-0.9.12.1.tar.gz) = e088ff441f62bab97f34b0171858c124d9eb01ec
|
||||
|
||||
8
net/silc-client/patches/patch-Makefile_defines_int_in
Normal file
8
net/silc-client/patches/patch-Makefile_defines_int_in
Normal file
@ -0,0 +1,8 @@
|
||||
$OpenBSD: patch-Makefile_defines_int_in,v 1.1 2003/04/18 03:22:23 brad Exp $
|
||||
--- Makefile.defines_int.in.orig Thu Apr 17 09:08:21 2003
|
||||
+++ Makefile.defines_int.in Thu Apr 17 09:08:38 2003
|
||||
@@ -45,3 +45,4 @@ silc_modulesdir=@MODULESDIR@
|
||||
silc_helpdir=@HELPDIR@
|
||||
silc_docdir=@DOCDIR@
|
||||
silc_logsdir=@LOGSDIR@
|
||||
+silc_mandir=@mandir@
|
||||
@ -1,24 +1,15 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.6 2003/01/15 03:06:26 brad Exp $
|
||||
--- Makefile.in.orig Wed Jan 8 11:19:40 2003
|
||||
+++ Makefile.in Tue Jan 14 09:07:54 2003
|
||||
@@ -706,7 +706,7 @@ install-dirs:
|
||||
|
||||
install-dirs-client: install-dirs
|
||||
-mkdir -p $(helpdir)
|
||||
- -mkdir -p $(mandir)/man1
|
||||
+ -mkdir -p $(DESTDIR)$(mandir)/man1
|
||||
|
||||
install-dirs-server: install-dirs
|
||||
-mkdir -p $(logsdir)
|
||||
@@ -727,7 +727,7 @@ doc-install:
|
||||
doc-install-client: doc-install
|
||||
$(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf
|
||||
-@if test -f $(srcdir)/doc/silc.1 ; then \
|
||||
- $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
|
||||
+ $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(DESTDIR)$(mandir)/man1; \
|
||||
fi
|
||||
|
||||
doc-install-server: doc-install
|
||||
$OpenBSD: patch-Makefile_in,v 1.7 2003/04/18 03:22:23 brad Exp $
|
||||
--- Makefile.in.orig Tue Mar 18 04:40:51 2003
|
||||
+++ Makefile.in Thu Apr 17 09:09:27 2003
|
||||
@@ -216,7 +216,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localstatedir = @localstatedir@
|
||||
-mansdir = $(DESTDIR)$(mandir)
|
||||
+mansdir = $(DESTDIR)$(silc_mandir)
|
||||
oldincludedir = @oldincludedir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
@@ -775,7 +775,7 @@ generate-server-key:
|
||||
$(sbindir)/silcd -C $(etcdir); \
|
||||
fi
|
||||
|
||||
28
net/silc-client/patches/patch-aclocal_m4
Normal file
28
net/silc-client/patches/patch-aclocal_m4
Normal file
@ -0,0 +1,28 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2003/04/18 03:22:23 brad Exp $
|
||||
--- aclocal.m4.orig Mon Mar 17 12:39:02 2003
|
||||
+++ aclocal.m4 Thu Apr 3 09:43:27 2003
|
||||
@@ -43,7 +43,7 @@
|
||||
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
|
||||
|
||||
|
||||
-AC_PREREQ([2.54])
|
||||
+AC_PREREQ([2.52])
|
||||
|
||||
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
|
||||
# the ones we care about.
|
||||
@@ -2403,13 +2403,13 @@ else
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
case "$host_os" in
|
||||
openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
@ -1,55 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.11 2003/01/15 03:06:26 brad Exp $
|
||||
--- configure.orig Wed Jan 8 11:19:37 2003
|
||||
+++ configure Mon Jan 13 20:09:18 2003
|
||||
@@ -3099,13 +3099,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-# XXX
|
||||
-# Compiler flags
|
||||
-#
|
||||
-if test "$GCC"; then
|
||||
- CFLAGS="-Wall -finline-functions $CFLAGS"
|
||||
-fi
|
||||
-
|
||||
#
|
||||
# Library versioning.
|
||||
#
|
||||
@@ -5963,7 +5956,7 @@ else
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
@@ -5973,7 +5966,7 @@ else
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
;;
|
||||
esac
|
||||
@@ -12512,19 +12505,16 @@ echo "${ECHO_T}yes" >&6
|
||||
#define SILC_DEBUG 1
|
||||
_ACEOF
|
||||
|
||||
- CFLAGS="-O -g $CFLAGS"
|
||||
summary_debug="yes"
|
||||
;;
|
||||
*)
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
- CFLAGS="-O2 -g $CFLAGS"
|
||||
;;
|
||||
esac
|
||||
|
||||
else
|
||||
|
||||
- CFLAGS="-O2 -g $CFLAGS"
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
45
net/silc-client/patches/patch-configure_in
Normal file
45
net/silc-client/patches/patch-configure_in
Normal file
@ -0,0 +1,45 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2003/04/18 03:22:23 brad Exp $
|
||||
--- configure.in.orig Thu Apr 3 09:39:09 2003
|
||||
+++ configure.in Thu Apr 3 09:41:02 2003
|
||||
@@ -40,7 +40,6 @@ AM_INIT_AUTOMAKE(silc-client, 0.9.12)
|
||||
AC_PREREQ(2.52)
|
||||
AC_CONFIG_HEADERS(includes/silcdefs.h)
|
||||
|
||||
-CFLAGS=
|
||||
AC_PROG_CC
|
||||
AC_C_INLINE
|
||||
AC_C_CONST
|
||||
@@ -339,33 +338,6 @@ AC_DEFUN(SILC_ADD_CFLAGS,
|
||||
$2])
|
||||
unset tmp_CFLAGS
|
||||
])
|
||||
-
|
||||
-if test "$GCC"; then
|
||||
- # GCC specific options
|
||||
- if test "x$summary_debug" = "xyes"; then
|
||||
- SILC_ADD_CFLAGS(-g -O)
|
||||
- else
|
||||
- SILC_ADD_CFLAGS(-g -O2)
|
||||
- fi
|
||||
- SILC_ADD_CFLAGS(-Wall -finline-functions)
|
||||
-else
|
||||
- # Other compilers
|
||||
- case "$target" in
|
||||
- alpha*-dec-osf*)
|
||||
- SILC_ADD_CFLAGS(-g3 -O2, SILC_ADD_CFLAGS(-g3 -O, SILC_ADD_CFLAGS(-O)))
|
||||
- ;;
|
||||
- *)
|
||||
- SILC_ADD_CFLAGS(-g)
|
||||
- SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
- # Intel C++ Compiler needs -restrict
|
||||
- if test "x$CC" = "xicc"; then
|
||||
- SILC_ADD_CFLAGS(-restrict)
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
|
||||
##
|
||||
## Installation
|
||||
Loading…
Reference in New Issue
Block a user