Attachment 37560 Details for Bug 59746 – file.diff

[patch] file.diff

file.diff (text/plain), 3.74 KB, created by Evgueni V. Gavrilov on 2003-11-28 10:30:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgueni V. Gavrilov

Created: 2003-11-28 10:30:14 UTC

Size: 3.74 KB

patch

obsolete

>diff -ruN silc-client.orig/Makefile silc-client/Makefile
>--- silc-client.orig/Makefile	Fri Nov 28 15:18:49 2003
>+++ silc-client/Makefile	Fri Nov 28 15:40:39 2003
>@@ -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 @@
> 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 @@
> 	@${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 -ruN silc-client.orig/distinfo silc-client/distinfo
>--- silc-client.orig/distinfo	Fri Nov 28 15:18:49 2003
>+++ silc-client/distinfo	Fri Nov 28 15:20:16 2003
>@@ -1 +1 @@
>-MD5 (silc-client-0.9.16.tar.bz2) = 0a7e6309034f8789beaea2305a4197ef
>+MD5 (silc-client-1.0.tar.bz2) = 49075f34f684564c3e84e869fb29c92f
>diff -ruN silc-client.orig/files/patch-lib-Makefile.in silc-client/files/patch-lib-Makefile.in
>--- silc-client.orig/files/patch-lib-Makefile.in	Thu Jan  1 06:00:00 1970
>+++ silc-client/files/patch-lib-Makefile.in	Fri Nov 28 15:56:18 2003
>@@ -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 -ruN silc-client.orig/pkg-plist silc-client/pkg-plist
>--- silc-client.orig/pkg-plist	Fri Nov 28 15:18:49 2003
>+++ silc-client/pkg-plist	Fri Nov 28 16:05:37 2003
>@@ -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,7 +123,7 @@
> @dirrm share/silc/scripts
> @dirrm share/silc
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm lib/silcsim/client
>+@unexec rmdir %D/lib/silcsim/client 2>/dev/null || true
> @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

Actions: View | Diff

Attachments on bug 59746: 37560