diff options
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/conserver8/Makefile | 37 | ||||
| -rw-r--r-- | comms/conserver8/distinfo | 3 | ||||
| -rw-r--r-- | comms/conserver8/options.mk | 23 | ||||
| -rw-r--r-- | comms/conserver8/patches/patch-ac | 13 |
4 files changed, 47 insertions, 29 deletions
diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile index be048fa4ce9..135b80d7891 100644 --- a/comms/conserver8/Makefile +++ b/comms/conserver8/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2008/01/18 05:06:25 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2009/06/14 07:52:51 wiz Exp $ # DISTNAME= conserver-8.1.16 PKGNAME= conserver8-8.1.16 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= comms MASTER_SITES= ftp://ftp.conserver.com/conserver/ @@ -13,6 +13,9 @@ COMMENT= Application that allows multiple users to watch serial consoles CONFLICTS= conserver-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS= ${EGDIR} ${DOCDIR} + PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES @@ -24,27 +27,9 @@ CONFIGURE_ARGS+= --with-regex CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} CONFIGURE_ARGS+= --with-logfile=${VARBASE:Q}/log/conserver -PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8 -PKG_SUPPORTED_OPTIONS= pam ssl uds -PKG_SUGGESTED_OPTIONS= ssl -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mpam) -. include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam -.endif +.include "options.mk" -.if !empty(PKG_OPTIONS:Muds) -CONFIGURE_ARGS+= --with-uds -.endif - -.if !empty(PKG_OPTIONS:Mssl) -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -. include "../../security/openssl/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-openssl -.endif -BUILD_DEFS+= CONSERVER_DEFAULTPORT CONSERVER_DEFAULTHOST +BUILD_DEFS+= CONSERVER_DEFAULTPORT CONSERVER_DEFAULTHOST VARBASE RCD_SCRIPTS= conserver8 @@ -59,15 +44,11 @@ OWN_DIRS= ${VARBASE}/consoles SUBST_CLASSES+= conf SUBST_STAGE.conf= post-patch SUBST_FILES.conf= conserver.cf/conserver.cf -SUBST_SED.conf= -e s,/var/consoles,${VARBASE}/consoles, - -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} +SUBST_SED.conf= -e "s,/var/consoles,${VARBASE}/consoles," post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} set -e; for File in INSTALL README PROTOCOL; do \ - ${INSTALL_DATA} ${WRKSRC}/$${File} ${DOCDIR}/$${File}; \ + ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File}; \ done .include "../../security/tcp_wrappers/buildlink3.mk" diff --git a/comms/conserver8/distinfo b/comms/conserver8/distinfo index fd4dbf84598..5256cfec3d7 100644 --- a/comms/conserver8/distinfo +++ b/comms/conserver8/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2007/06/07 09:30:59 he Exp $ +$NetBSD: distinfo,v 1.5 2009/06/14 07:52:51 wiz Exp $ SHA1 (conserver-8.1.16.tar.gz) = 6e2a985927812cc8c253463d53911dc37fb37111 RMD160 (conserver-8.1.16.tar.gz) = 918832d21d46f7f20cf9c1088c058190093343a0 Size (conserver-8.1.16.tar.gz) = 311373 bytes SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01 SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3 +SHA1 (patch-ac) = b498eede8b62a95874f14f1aeaff1f2f3ecacb9a diff --git a/comms/conserver8/options.mk b/comms/conserver8/options.mk new file mode 100644 index 00000000000..20c9b980bb8 --- /dev/null +++ b/comms/conserver8/options.mk @@ -0,0 +1,23 @@ +# $NetBSD: options.mk,v 1.1 2009/06/14 07:52:51 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8 +PKG_SUPPORTED_OPTIONS= pam ssl uds +PKG_SUGGESTED_OPTIONS= ssl + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mpam) +. include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --with-pam +.endif + +.if !empty(PKG_OPTIONS:Muds) +CONFIGURE_ARGS+= --with-uds +.endif + +.if !empty(PKG_OPTIONS:Mssl) +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} +. include "../../security/openssl/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-openssl +.endif diff --git a/comms/conserver8/patches/patch-ac b/comms/conserver8/patches/patch-ac new file mode 100644 index 00000000000..34978321225 --- /dev/null +++ b/comms/conserver8/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2009/06/14 07:52:51 wiz Exp $ + +--- conserver/cutil.c.orig 2006-12-26 07:27:34.000000000 +0000 ++++ conserver/cutil.c +@@ -2283,7 +2283,7 @@ ProbeInterfaces(bindAddr) + if ((ifc.ifc_len - r) < sizeof(*ifr)) + break; + #ifdef HAVE_SA_LEN +- if (sa->sa_len > sizeof(ifr->ifr_addr)) ++ if (sa->sa_len > sizeof(ifr->ifr_ifru)) + r += sizeof(ifr->ifr_name) + sa->sa_len; + else + #endif |