- Use the correct autoconf version.

- Don't try and install a file into a directory before it's created,
(Fixes packaging with systrace; rather than returning 'No such file or
directory' when you try to 'install aaa bbb/', under systrace aaa gets
installed to a *file* named bbb).

ok Brad.
This commit is contained in:
sthen 2010-05-17 22:53:37 +00:00
parent 0280b75cf5
commit 765c63f683
2 changed files with 16 additions and 9 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.58 2010/05/17 08:39:24 sthen Exp $
# $OpenBSD: Makefile,v 1.59 2010/05/17 22:53:37 sthen Exp $
COMMENT= Secure Internet Live Conferencing (SILC) server
DISTNAME= silc-server-1.1.18
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= net
HOMEPAGE= http://www.silcnet.org/
@ -41,8 +41,7 @@ SUBST_VARS= CONFDIR
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-shared
CONFIGURE_STYLE= autoconf
# XXX should be 2.63
AUTOCONF_VERSION= 2.61
AUTOCONF_VERSION= 2.63
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
CONFIGURE_ENV+= ac_cv_path_NASM=no YASM=${LOCALBASE}/bin/yasm
.endif

View File

@ -1,7 +1,15 @@
$OpenBSD: patch-apps_silcd_Makefile_in,v 1.6 2009/08/01 09:21:55 sthen Exp $
--- apps/silcd/Makefile.in.orig Sat Aug 1 07:57:32 2009
+++ apps/silcd/Makefile.in Sat Aug 1 10:12:29 2009
@@ -604,8 +604,8 @@ etc-install-server:
$OpenBSD: patch-apps_silcd_Makefile_in,v 1.7 2010/05/17 22:53:37 sthen Exp $
--- apps/silcd/Makefile.in.orig Sat Sep 26 21:34:14 2009
+++ apps/silcd/Makefile.in Mon May 17 09:21:59 2010
@@ -586,7 +586,6 @@ install-dirs-server:
-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
@@ -604,8 +603,8 @@ etc-install-server:
fi
examples-install:
@ -12,7 +20,7 @@ $OpenBSD: patch-apps_silcd_Makefile_in,v 1.6 2009/08/01 09:21:55 sthen Exp $
generate-server-key:
-@if test '!' -f $(etcdir)/silcd.pub ; then \
@@ -613,11 +613,8 @@ generate-server-key:
@@ -613,11 +612,8 @@ generate-server-key:
fi
install-data-hook: \