View | Details | Raw Unified | Return to bug 113367
Collapse All | Expand All

(-)Makefile (-31 / +16 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	silc
8
PORTNAME=	silc
9
PORTVERSION=	1.0.3
9
PORTVERSION=	1.1
10
CATEGORIES=	net ipv6 security
10
CATEGORIES=	net ipv6 security
11
MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
11
MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
12
		http://ftp.silcnet.org/%SUBDIR%/ \
12
		http://ftp.silcnet.org/%SUBDIR%/ \
Lines 28-49 Link Here
28
COMMENT=	Secure Internet Live Conferencing (SILC) network client
28
COMMENT=	Secure Internet Live Conferencing (SILC) network client
29
29
30
USE_BZIP2=	yes
30
USE_BZIP2=	yes
31
USE_PERL5=	yes
32
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
33
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
32
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
34
USE_GNOME=	glib12
33
USE_GNOME=	glib12
35
USE_GMAKE=	yes
34
USE_GMAKE=	yes
36
CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME} \
35
CONFIGURE_ARGS=	--docdir=${PREFIX}/share/doc/silc \
37
		--with-simdir=${PREFIX}/lib/silcsim/client \
36
		--mandir=${PREFIX}/man \
38
		--with-helpdir=${PREFIX}/share/${PORTNAME}/help \
39
		--with-docdir=${PREFIX}/share/doc/silc \
40
		--with-perl=no \
37
		--with-perl=no \
41
		--without-libtoolfix
38
		--without-libtoolfix \
42
#INSTALLS_SHLIB=	yes
39
		--disable-optimizations
43
PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
40
MAN1=	silc.1
44
PKGDEINSTALL=	${PKGINSTALL}
45
46
INSTALL_DIR?=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
47
41
48
.ifndef(WITH_PTHREADS)
42
.ifndef(WITH_PTHREADS)
49
CONFIGURE_ARGS+=	--without-pthreads
43
CONFIGURE_ARGS+=	--without-pthreads
Lines 61-92 Link Here
61
.ifndef(WITH_PTHREADS)
55
.ifndef(WITH_PTHREADS)
62
	@${ECHO_MSG} '===> Define WITH_PTHREADS to enable pthreads support'
56
	@${ECHO_MSG} '===> Define WITH_PTHREADS to enable pthreads support'
63
.endif
57
.endif
64
	@${ECHO_MSG}
65
.ifndef(WITH_OPTIMIZED_CFLAGS)
66
	@${ECHO_MSG} '===> Define WITH_OPTIMIZED_CFLAGS to enable compilation optimizations'
67
	@${ECHO_MSG} '===> which is known to break some platforms (e.g., alpha)'
68
.endif
69
58
70
post-patch:
59
post-patch:
71
.ifndef(WITH_OPTIMIZED_CFLAGS)
72
	@${PERL} -pi -e 's/-O2//' ${WRKSRC}/${CONFIGURE_SCRIPT}
73
.endif
74
# install neither documentation nor silc server, we have ports for those
60
# install neither documentation nor silc server, we have ports for those
75
	@${PERL} -pi -e 's/-D_THREAD_SAFE//' ${WRKSRC}/${CONFIGURE_SCRIPT}
61
	@${REINPLACE_CMD} -e 's/-D_THREAD_SAFE//' ${WRKSRC}/${CONFIGURE_SCRIPT}
76
	@${PERL} -pi -e 's/docdir/DOCDIR/' ${WRKSRC}/doc/Makefile.in
62
	@${REINPLACE_CMD} -e 's/docdir/DOCDIR/' ${WRKSRC}/doc/Makefile.in
77
	@${PERL} -pi -e 's/^(install-data-am:) install-docDATA$$/\1/' \
63
	@${REINPLACE_CMD} -e 's/^install-data-am: install-docDATA$$/install-data-am:/' \
78
		${WRKSRC}/apps/irssi/docs/Makefile.in
64
		${WRKSRC}/apps/irssi/docs/Makefile.in
79
	@${PERL} -pi -e 's/^(install-data-am:) install-moduleLTLIBRARIES$$/\1/' \
65
	@${REINPLACE_CMD} -e 's/^install-data-am: install-moduleLTLIBRARIES$$/install-data-am:/' \
80
		${WRKSRC}/apps/irssi/src/perl/Makefile.in
66
		${WRKSRC}/apps/irssi/src/perl/Makefile.in
81
	@${PERL} -pi -e 's/--libtool-enable-shared//' \
67
	@${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \
82
		${WRKSRC}/lib/silccrypt/Makefile.in
68
		${WRKSRC}/lib/silccrypt/Makefile.in
83
69
	@${REINPLACE_CMD} -e 's/^MODULESDIR="$$silc_prefix/MODULESDIR="$$silc_prefix\/share\/silc/' ${WRKSRC}/configure
84
#post-configure:
85
#	@${CP} ${LIBTOOL} ${WRKSRC}
86
70
87
post-install:
71
post-install:
88
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
72
	@if [ ! -f ${PREFIX}/etc/silc.conf ]; then \
89
		${PKGINSTALL} ${PKGNAME} POST-INSTALL
73
		${CP} -p ${PREFIX}/etc/silc.conf.sample ${PREFIX}/etc/silc.conf ; \
74
	fi
90
75
91
.include <bsd.port.pre.mk>
76
.include <bsd.port.pre.mk>
92
77
Lines 94-100 Link Here
94
WITHOUT_OPTIMIZED_ASM=	yes
79
WITHOUT_OPTIMIZED_ASM=	yes
95
.endif
80
.endif
96
81
97
.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
82
.ifndef(WITHOUT_IPV6)
98
CONFIGURE_ARGS+=	--enable-ipv6
83
CONFIGURE_ARGS+=	--enable-ipv6
99
.endif
84
.endif
100
85
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (silc-client-1.0.3.tar.bz2) = 6727a65fe71b90b018086afe8fc84cf9
1
MD5 (silc-client-1.1.tar.bz2) = 3b2d25e2379c79d88169ef777230f318
2
SHA256 (silc-client-1.0.3.tar.bz2) = ee4b39b1122ac47f678edb874288412d208f57ccad9e81b1086126276d6a5440
2
SHA256 (silc-client-1.1.tar.bz2) = b41f162cd06e3b21daacd39a54438cc5b8c63228110bebeaf7b8c886bf107326
3
SIZE (silc-client-1.0.3.tar.bz2) = 1424405
3
SIZE (silc-client-1.1.tar.bz2) = 1611218
(-)pkg-install (-61 lines)
Removed Link Here
1
#!/bin/sh
2
# $FreeBSD: ports/net/silc-client/pkg-install,v 1.3 2007/01/18 16:26:34 rafan Exp $
3
4
# based on original from op port, written by Cyrille Lefevre
5
# <clefevre@citeweb.net>
6
7
[ $# != 2 ] && exit 1
8
PKGNAME=$1
9
ACTION=$2
10
11
CONF_DIR=${PKG_PREFIX}/etc/silc
12
DOC_DIR=${PKG_PREFIX}/share/doc/silc
13
#/example_silc.conf
14
15
CONF_FILE=silc.conf
16
CONF_OWN=root
17
CONF_GRP=wheel
18
CONF_MODE=444
19
20
SAMP_SUFX=.sample
21
22
INSTALL=install
23
CMP=cmp
24
RM=rm
25
RMDIR=rmdir
26
27
INSTALL_DIR="${INSTALL} -d -o root -g wheel -m 755"
28
29
case "$ACTION" in
30
31
POST-INSTALL)
32
	if [ -f "${CONF_DIR}/${CONF_FILE}" ]
33
	then
34
		echo "$PKGNAME: Will not overwrite existing ${CONF_DIR}/${CONF_FILE} configuration file."
35
	else
36
		${INSTALL} -c -o ${CONF_OWN} -g ${CONF_GRP} -m ${CONF_MODE} \
37
			${DOC_DIR}/example_silc.conf \
38
			${CONF_DIR}/${CONF_FILE}
39
	fi
40
	;;
41
42
DEINSTALL)
43
	if ${CMP} -s ${DOC_DIR}/example_silc.conf \
44
		  ${CONF_DIR}/${CONF_FILE}; then
45
		${RM} -f ${CONF_DIR}/${CONF_FILE}
46
	else
47
		echo "$PKGNAME: Will not remove existing ${CONF_DIR}/${CONF_FILE} configuration file."
48
		echo "$PKGNAME: However, if you are permanently removing this port, you should do a 'rm -f ${CONF_DIR}/${CONF_FILE}' to remove the configuration file left."
49
		echo "$PKGNAME: Also, do not forget to 'rmdir ${CONF_DIR} 2>/dev/null'"
50
	fi
51
	;;
52
53
PRE-INSTALL|POST-DEINSTALL)
54
	;;
55
56
*)
57
	exit 1
58
	;;
59
esac
60
61
exit
(-)pkg-plist (-112 / +115 lines)
Lines 1-113 Link Here
1
bin/silc
1
bin/silc
2
share/silc/help/action
2
%%DATADIR%%/help/action
3
share/silc/help/admin
3
%%DATADIR%%/help/admin
4
share/silc/help/alias
4
%%DATADIR%%/help/alias
5
share/silc/help/attr
5
%%DATADIR%%/help/attr
6
share/silc/help/away
6
%%DATADIR%%/help/away
7
share/silc/help/ban
7
%%DATADIR%%/help/ban
8
share/silc/help/beep
8
%%DATADIR%%/help/beep
9
share/silc/help/bind
9
%%DATADIR%%/help/bind
10
share/silc/help/cat
10
%%DATADIR%%/help/cat
11
share/silc/help/cd
11
%%DATADIR%%/help/cd
12
share/silc/help/channel
12
%%DATADIR%%/help/channel
13
share/silc/help/clear
13
%%DATADIR%%/help/clear
14
share/silc/help/close
14
%%DATADIR%%/help/close
15
share/silc/help/cmode
15
%%DATADIR%%/help/cmode
16
share/silc/help/connect
16
%%DATADIR%%/help/connect
17
share/silc/help/cumode
17
%%DATADIR%%/help/cumode
18
share/silc/help/cycle
18
%%DATADIR%%/help/cycle
19
share/silc/help/date
19
%%DATADIR%%/help/date
20
share/silc/help/dehilight
20
%%DATADIR%%/help/dehilight
21
share/silc/help/detach
21
%%DATADIR%%/help/detach
22
share/silc/help/disconnect
22
%%DATADIR%%/help/disconnect
23
share/silc/help/echo
23
%%DATADIR%%/help/echo
24
share/silc/help/eval
24
%%DATADIR%%/help/eval
25
share/silc/help/exec
25
%%DATADIR%%/help/exec
26
share/silc/help/file
26
%%DATADIR%%/help/file
27
share/silc/help/format
27
%%DATADIR%%/help/format
28
share/silc/help/getkey
28
%%DATADIR%%/help/getkey
29
share/silc/help/help
29
%%DATADIR%%/help/help
30
share/silc/help/hilight
30
%%DATADIR%%/help/hilight
31
share/silc/help/ignore
31
%%DATADIR%%/help/ignore
32
share/silc/help/info
32
%%DATADIR%%/help/info
33
share/silc/help/invite
33
%%DATADIR%%/help/invite
34
share/silc/help/invitelist
34
%%DATADIR%%/help/invitelist
35
share/silc/help/join
35
%%DATADIR%%/help/join
36
share/silc/help/key
36
%%DATADIR%%/help/key
37
share/silc/help/kick
37
%%DATADIR%%/help/kick
38
share/silc/help/kickban
38
%%DATADIR%%/help/kickban
39
share/silc/help/kill
39
%%DATADIR%%/help/kill
40
share/silc/help/knockout
40
%%DATADIR%%/help/knockout
41
share/silc/help/lastlog
41
%%DATADIR%%/help/lastlog
42
share/silc/help/layout
42
%%DATADIR%%/help/layout
43
share/silc/help/levels
43
%%DATADIR%%/help/levels
44
share/silc/help/list
44
%%DATADIR%%/help/list
45
share/silc/help/listkeys
45
%%DATADIR%%/help/listkeys
46
share/silc/help/load
46
%%DATADIR%%/help/load
47
share/silc/help/log
47
%%DATADIR%%/help/log
48
share/silc/help/me
48
%%DATADIR%%/help/me
49
share/silc/help/motd
49
%%DATADIR%%/help/motd
50
share/silc/help/mmsg
50
%%DATADIR%%/help/mmsg
51
share/silc/help/msg
51
%%DATADIR%%/help/msg
52
share/silc/help/names
52
%%DATADIR%%/help/names
53
share/silc/help/nick
53
%%DATADIR%%/help/nick
54
share/silc/help/notice
54
%%DATADIR%%/help/notice
55
share/silc/help/oper
55
%%DATADIR%%/help/oper
56
share/silc/help/part
56
%%DATADIR%%/help/part
57
share/silc/help/perlflush
57
%%DATADIR%%/help/perlflush
58
share/silc/help/ping
58
%%DATADIR%%/help/ping
59
share/silc/help/query
59
%%DATADIR%%/help/query
60
share/silc/help/quit
60
%%DATADIR%%/help/quit
61
share/silc/help/reconnect
61
%%DATADIR%%/help/recode
62
share/silc/help/reload
62
%%DATADIR%%/help/reconnect
63
share/silc/help/rmreconns
63
%%DATADIR%%/help/reload
64
share/silc/help/rmrejoins
64
%%DATADIR%%/help/rmreconns
65
share/silc/help/save
65
%%DATADIR%%/help/rmrejoins
66
share/silc/help/sconnect
66
%%DATADIR%%/help/save
67
share/silc/help/script
67
%%DATADIR%%/help/sconnect
68
share/silc/help/scrollback
68
%%DATADIR%%/help/script
69
share/silc/help/server
69
%%DATADIR%%/help/scrollback
70
share/silc/help/set
70
%%DATADIR%%/help/server
71
share/silc/help/shutdown
71
%%DATADIR%%/help/set
72
share/silc/help/silcnet
72
%%DATADIR%%/help/shutdown
73
share/silc/help/silcoper
73
%%DATADIR%%/help/silcnet
74
share/silc/help/smsg
74
%%DATADIR%%/help/silcoper
75
share/silc/help/stats
75
%%DATADIR%%/help/smsg
76
share/silc/help/statusbar
76
%%DATADIR%%/help/stats
77
share/silc/help/toggle
77
%%DATADIR%%/help/statusbar
78
share/silc/help/topic
78
%%DATADIR%%/help/toggle
79
share/silc/help/umode
79
%%DATADIR%%/help/topic
80
share/silc/help/unalias
80
%%DATADIR%%/help/umode
81
share/silc/help/unignore
81
%%DATADIR%%/help/unalias
82
share/silc/help/unload
82
%%DATADIR%%/help/unignore
83
share/silc/help/unquery
83
%%DATADIR%%/help/unload
84
share/silc/help/users
84
%%DATADIR%%/help/unquery
85
share/silc/help/version
85
%%DATADIR%%/help/users
86
share/silc/help/watch
86
%%DATADIR%%/help/version
87
share/silc/help/whois
87
%%DATADIR%%/help/watch
88
share/silc/help/whowas
88
%%DATADIR%%/help/whois
89
share/silc/help/window
89
%%DATADIR%%/help/whowas
90
share/silc/themes/default.theme
90
%%DATADIR%%/help/window
91
share/silc/scripts/autoop.pl
91
%%DATADIR%%/themes/default.theme
92
share/silc/scripts/beep.pl
92
%%DATADIR%%/themes/plugin.theme
93
share/silc/scripts/clones.pl
93
%%DATADIR%%/scripts/autoop.pl
94
share/silc/scripts/dns.pl
94
%%DATADIR%%/scripts/autorejoin.pl
95
share/silc/scripts/hello.pl
95
%%DATADIR%%/scripts/buf.pl
96
share/silc/scripts/mail-maildir.pl
96
%%DATADIR%%/scripts/command.pl
97
share/silc/scripts/mail.pl
97
%%DATADIR%%/scripts/dns.pl
98
share/silc/scripts/silc-mime.pl
98
%%DATADIR%%/scripts/kills.pl
99
%%PORTDOCS%%%%DOCSDIR%%/COPYING
99
%%DATADIR%%/scripts/mail.pl
100
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
100
%%DATADIR%%/scripts/mlock.pl
101
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
101
%%DATADIR%%/scripts/msg-event.pl
102
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
102
%%DATADIR%%/scripts/quitmsg.pl
103
%%PORTDOCS%%%%DOCSDIR%%/TODO
103
%%DATADIR%%/scripts/redirect.pl
104
%%PORTDOCS%%%%DOCSDIR%%/README
104
%%DATADIR%%/scripts/scriptassist.pl
105
%%PORTDOCS%%%%DOCSDIR%%/example_silc.conf
105
%%DATADIR%%/scripts/silc.pl
106
@dirrm share/silc/themes
106
%%DATADIR%%/scripts/splitlong.pl
107
@dirrm share/silc/help
107
%%DATADIR%%/scripts/usercount.pl
108
@dirrm share/silc/scripts
108
@unexec if cmp -s %D/etc/silc.conf.sample %D/etc/silc.conf; then rm -f %D/etc/silc.conf; fi
109
@dirrm share/silc
109
etc/silc.conf.sample
110
%%PORTDOCS%%@dirrm %%DOCSDIR%%
110
@exec if [ ! -f %D/etc/silc.conf ] ; then cp -p %D/%F %B/silc.conf; fi
111
@dirrmtry etc/silc
111
@dirrm %%DATADIR%%/themes
112
@dirrmtry lib/silcsim/client
112
@dirrm %%DATADIR%%/help
113
@dirrmtry lib/silcsim
113
@dirrm %%DATADIR%%/scripts
114
@dirrm %%DATADIR%%/modules
115
@dirrm %%DATADIR%%
116
@dirrm %%DOCSDIR%%
(-)files/patch-apps__irssi__Makefile.in (+11 lines)
Added Link Here
1
--- ./apps/irssi/Makefile.in.orig	Mon Jun  4 05:22:15 2007
2
+++ ./apps/irssi/Makefile.in	Tue Jun  5 00:55:54 2007
3
@@ -813,7 +813,7 @@
4
 	-mkdir -p $(mandir)/man1
5
 
6
 doc-install-client:
7
-	$(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf
8
+	$(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(sysconfdir)/silc.conf.sample
9
 	-@if test -f $(silc_top_srcdir)/doc/silc.1 ; then \
10
 	 $(INSTALL_DATA) $(silc_top_srcdir)/doc/silc.1 $(mandir)/man1; \
11
 	fi
(-)files/patch-doc-Makefile.in (-25 lines)
Removed Link Here
1
--- doc/Makefile.in.orig	Thu Jan 18 12:14:15 2007
2
+++ doc/Makefile.in	Thu Jan 18 12:14:46 2007
3
@@ -402,22 +402,9 @@
4
 
5
 
6
 all:
7
-	touch draft-riikonen-silc-spec-08.txt
8
-	touch draft-riikonen-silc-pp-09.txt
9
-	touch draft-riikonen-silc-ke-auth-08.txt
10
-	touch draft-riikonen-silc-commands-06.txt
11
-	touch draft-riikonen-silc-flags-payloads-04.txt
12
-	touch draft-riikonen-presence-attrs-03.txt
13
 
14
 dist-hook:
15
 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
16
-	rm draft-riikonen*.txt
17
-	touch draft-riikonen-silc-spec-08.txt
18
-	touch draft-riikonen-silc-pp-09.txt
19
-	touch draft-riikonen-silc-ke-auth-08.txt
20
-	touch draft-riikonen-silc-commands-06.txt
21
-	touch draft-riikonen-silc-flags-payloads-04.txt
22
-	touch draft-riikonen-presence-attrs-03.txt
23
 
24
 doc-install:
25
 	-mkdir -p $(DOCDIR)
(-)files/patch-doc__Makefile.in (+17 lines)
Added Link Here
1
--- ./doc/Makefile.in.orig	Tue Jun  5 01:18:13 2007
2
+++ ./doc/Makefile.in	Tue Jun  5 01:18:39 2007
3
@@ -449,14 +449,6 @@
4
 	$(SILC_TOP_SRCDIR)/scripts/manpages.pl
5
 
6
 doc-install:
7
-	-mkdir -p $(docdir)
8
-	-$(INSTALL_DATA) $(top_srcdir)/doc/FAQ $(docdir)/
9
-	-$(INSTALL_DATA) $(top_srcdir)/COPYING $(docdir)/
10
-	-$(INSTALL_DATA) $(top_srcdir)/CHANGES $(docdir)/
11
-	-$(INSTALL_DATA) $(top_srcdir)/CREDITS $(docdir)/
12
-	-$(INSTALL_DATA) $(top_srcdir)/README* $(docdir)/
13
-	-$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/
14
-	-$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/
15
 
16
 install-data-hook:	doc-install
17
 
(-)files/patch-irssi::src::core::network.c (-11 lines)
Removed Link Here
1
--- apps/irssi/src/core/network.c.orig	Sun Jan 25 10:11:14 2004
2
+++ apps/irssi/src/core/network.c	Sun Jan 25 10:11:29 2004
3
@@ -611,7 +611,7 @@
4
 int net_hosterror_notfound(int error)
5
 {
6
 #ifdef HAVE_IPV6
7
-	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
8
+	return error != 1 && (error == EAI_NONAME);
9
 #else
10
 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
11
 #endif

Return to bug 113367