Index: head/net/silc-server/Makefile =================================================================== --- head/net/silc-server/Makefile (revision 226612) +++ head/net/silc-server/Makefile (revision 226613) @@ -1,80 +1,80 @@ # New ports collection makefile for: silc server # Date created: Thu Nov 8 01:50:05 BRST 2001 # Whom: Mario Sergio Fujikawa Ferreira # # $FreeBSD$ # PORTNAME= silc -PORTVERSION= 1.1.14 +PORTVERSION= 1.1.15 CATEGORIES= net ipv6 security MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \ http://ftp.silcnet.org/%SUBDIR%/ \ http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \ http://www.fi.silcnet.org/download/%SUBDIR%/ \ http://munitions.vipul.net/software/mirrors/silc/%SUBDIR%/ \ http://www.pl.silcnet.org/download/%SUBDIR%/ \ http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \ ftp://ftp.silcnet.org/silc/%SUBDIR%/ \ ftp://ftp.au.silcnet.org/pub/silcnet/%SUBDIR%/ \ ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \ ftp://ftp.pl.silcnet.org/pub/silc/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/ MASTER_SITE_SUBDIR= server/sources PKGNAMESUFFIX= -server DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= wxs@FreeBSD.org COMMENT= Secure Internet Live Conferencing (SILC) network server SUB_FILES= pkg-message pkg-deinstall USE_RC_SUBR= silcd USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \ --sysconfdir=${PREFIX}/etc/${PORTNAME} \ --with-helpdir=share/${PORTNAME}/help \ --with-logsdir=/var/log/${PORTNAME} \ --with-silcd-pid-file=/var/run/silcd.pid \ --enable-ipv6 \ --enable-debug MAN5= silcd.conf.5 MAN8= silcd.8 .include .if ${ARCH} != "i386" WITHOUT_OPTIMIZED_ASM= yes .endif .ifdef(WITHOUT_OPTIMIZED_ASM) CONFIGURE_ARGS+= --disable-asm .endif pre-everything:: .ifndef(WITHOUT_OPTIMIZED_ASM) @${ECHO_MSG} '===> Define WITHOUT_OPTIMIZED_ASM to disable assembler optimizations' .endif post-patch: .ifdef(NOPORTEXAMPLES) @${REINPLACE_CMD} -E -e \ '/examples-install.*\\/d' \ ${WRKSRC}/apps/silcd/Makefile.in .endif @${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \ ${WRKSRC}/lib/silccrypt/Makefile.in post-install: @if [ ! -f ${PREFIX}/etc/silc/silcd.conf ]; then \ ${CP} -p ${PREFIX}/etc/silc/silcd.conf.sample ${PREFIX}/etc//silc/silcd.conf; \ fi @if [ ! -f ${PREFIX}/etc/silc/silcalgs.conf ]; then \ ${CP} -p ${PREFIX}/etc/silc/silcalgs.conf.sample ${PREFIX}/etc/silc/silcalgs.conf; \ fi @${CAT} ${PKGMESSAGE} .include Property changes on: head/net/silc-server/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.45 \ No newline at end of property +1.46 \ No newline at end of property Index: head/net/silc-server/distinfo =================================================================== --- head/net/silc-server/distinfo (revision 226612) +++ head/net/silc-server/distinfo (revision 226613) @@ -1,3 +1,3 @@ -MD5 (silc-server-1.1.14.tar.bz2) = 67ecd25be796bfe660fbfb7018c959db -SHA256 (silc-server-1.1.14.tar.bz2) = f06fc8d61790c082556852293c46eaba5af3afdb51d067b448592b9dc5489cd9 -SIZE (silc-server-1.1.14.tar.bz2) = 924903 +MD5 (silc-server-1.1.15.tar.bz2) = 96d61e3e52ac46e0014a151006204088 +SHA256 (silc-server-1.1.15.tar.bz2) = 92a59eee4cb5195c8c708588631bc8c555fc86be76b3ee945f6bc71af2ae7c57 +SIZE (silc-server-1.1.15.tar.bz2) = 900765 Property changes on: head/net/silc-server/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/net/silc-server/files/patch-apps:silcd:Makefile.in =================================================================== --- head/net/silc-server/files/patch-apps:silcd:Makefile.in (revision 226612) +++ head/net/silc-server/files/patch-apps:silcd:Makefile.in (revision 226613) @@ -1,56 +1,45 @@ ---- apps/silcd/Makefile.in.orig 2007-11-18 07:37:58.000000000 -0500 -+++ apps/silcd/Makefile.in 2008-01-03 00:30:42.000000000 -0500 -@@ -350,8 +350,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$p'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$p" || exit 1; \ - else :; fi; \ - done +--- ./apps/silcd/Makefile.in.orig 2009-01-20 19:16:34.173984834 -0500 ++++ ./apps/silcd/Makefile.in 2009-01-20 19:38:32.379638067 -0500 +@@ -577,14 +577,11 @@ -@@ -576,14 +576,11 @@ - install-dirs-server: - -mkdir -p $(docdir) -mkdir -p $(etcdir) - -mkdir -p $(logsdir) -mkdir -p $(mandir)/man5 -mkdir -p $(mandir)/man8 doc-install-server: - -$(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf $(docdir)/ -@if test -f $(top_srcdir)/doc/silcd.8 ; then \ $(INSTALL_DATA) $(top_srcdir)/doc/silcd.8 $(mandir)/man8; \ fi -@@ -592,22 +589,17 @@ +@@ -593,22 +590,17 @@ fi etc-install-server: - -@if test '!' -f $(etcdir)/silcd.conf ; then \ $(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf \ - $(etcdir)/silcd.conf; \ + $(etcdir)/silcd.conf.sample; \ $(INSTALL_DATA) $(top_srcdir)/doc/silcalgs.conf \ - $(etcdir)/silcalgs.conf; \ - chmod go= $(etcdir)/silcd.conf; \ - fi -+ $(etcdir)/silcalgs.conf.sample; ++ $(etcdir)/silcalgs.conf.sample; \ examples-install: - -mkdir -p $(docdir)/examples/ - -$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(docdir)/examples/ + -mkdir -p $(prefix)/share/examples/silc + -$(INSTALL_DATA) $(top_srcdir)/doc/examples/README $(prefix)/share/examples/silc + -$(INSTALL_DATA) $(top_srcdir)/doc/examples/cell* $(prefix)/share/examples/silc generate-server-key: - -@if test '!' -f $(etcdir)/silcd.pub ; then \ - $(sbindir)/silcd -C $(etcdir); \ - fi install-data-hook: \ install-dirs-server \ Property changes on: head/net/silc-server/files/patch-apps:silcd:Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/silc-server/pkg-plist =================================================================== --- head/net/silc-server/pkg-plist (revision 226612) +++ head/net/silc-server/pkg-plist (revision 226613) @@ -1,15 +1,15 @@ sbin/silcd @unexec if cmp -s %D/etc/silc/silcd.conf.sample %D/etc/silc/silcd.conf; then rm -f %D/etc/silc/silcd.conf; fi etc/silc/silcd.conf.sample @exec if [ ! -f %D/etc/silc/silcd.conf ] ; then cp -p %D/%F %B/silcd.conf; fi @unexec if cmp -s %D/etc/silc/silcalgs.conf.sample %D/etc/silc/silcalgs.conf; then rm -f %D/etc/silc/silcalgs.conf; fi etc/silc/silcalgs.conf.sample @exec if [ ! -f %D/etc/silc/silcalgs.conf ] ; then cp -p %D/%F %B/silcalgs.conf; fi -%%PORTDOCS%%%%EXAMPLESDIR%%/README -%%PORTDOCS%%%%EXAMPLESDIR%%/cell_backup.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/cell_router.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/cell_server1.conf -%%PORTDOCS%%%%EXAMPLESDIR%%/cell_server2.conf -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_backup.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_router.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_server1.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cell_server2.conf +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @dirrmtry etc/silc @dirrmtry var/log/silc Property changes on: head/net/silc-server/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property