Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/chat/unrealircd/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/chat/unrealircd/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- pkgsrc/chat/unrealircd/Makefile 2006/02/16 21:30:06 1.10 +++ pkgsrc/chat/unrealircd/Makefile 2006/03/07 17:23:51 1.11 @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.10 2006/02/16 21:30:06 adrianp Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/07 17:23:51 adrianp Exp $ DISTNAME= Unreal3.2.4 PKGNAME= unrealircd-3.2.4 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= chat -MASTER_SITES= http://unrealircd.atlanti-ka.org/ \ +MASTER_SITES= http://unreal.fire-com.net/ \ http://www.ilmarinen.us/unreal/ \ http://www1.dnwt.net/unreal/ MAINTAINER= adrianp@NetBSD.org -HOMEPAGE= http://www.unrealircd.com/ +HOMEPAGE= http://www.unrealircd.com/ COMMENT= Advanced IRC server with IPv6 and SSL support CONFLICTS+= ircu-[0-9]* @@ -21,19 +21,19 @@ WRKSRC= ${WRKDIR}/Unreal3.2 TRE_NEEDED= 0.7.2 CARES_NEEDED= 1.3.0 -BUILDLINK_DEPENDS.tre+= tre-${TRE_NEEDED} -BUILDLINK_DEPENDS.libcares+= libcares-${CARES_NEEDED} +BUILDLINK_DEPENDS.tre+= tre-${TRE_NEEDED} +BUILDLINK_DEPENDS.libcares+= libcares-${CARES_NEEDED} .include "../../mk/bsd.prefs.mk" -CONFIGURE_ENV+= tre_version=${TRE_NEEDED:Q} -CONFIGURE_ENV+= TRELIBS="-L${PREFIX}/lib -ltre" -CONFIGURE_ENV+= cares_version=${CARES_NEEDED:Q} -CONFIGURE_ENV+= CARESINCDIR="${PREFIX}/include" -CONFIGURE_ENV+= CARESLIBS="-L${PREFIX}/lib -lcares" +CONFIGURE_ENV+= tre_version=${TRE_NEEDED:Q} +CONFIGURE_ENV+= TRELIBS='-L${PREFIX:Q}/lib -ltre' +CONFIGURE_ENV+= cares_version=${CARES_NEEDED:Q} +CONFIGURE_ENV+= CARESINCDIR='${PREFIX:Q}/include' +CONFIGURE_ENV+= CARESLIBS='-L${PREFIX:Q}/lib -lcares' CONFIGURE_ARGS+= --with-dpath=${UIRCD_HOME:Q} -CONFIGURE_ARGS+= --with-spath=${PREFIX}/sbin/ircd +CONFIGURE_ARGS+= --with-spath=${PREFIX:Q}/sbin/ircd CONFIGURE_ARGS+= --with-permissions=0660 CONFIGURE_ARGS+= --enable-dynamic-linking @@ -47,9 +47,9 @@ CONFIGURE_ARGS+= --disable-inet6 .include "options.mk" -IRCD_DOCS= ${PREFIX}/share/doc/unrealircd -IRCD_SHARE= ${PREFIX}/share/unrealircd -IRCD_EG= ${PREFIX}/share/examples/unrealircd +IRCD_DOCS= ${PREFIX:Q}/share/doc/unrealircd +IRCD_SHARE= ${PREFIX:Q}/share/unrealircd +IRCD_EG= ${PREFIX:Q}/share/examples/unrealircd BUILD_DEFS+= UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_USER UIRCD_HOST BUILD_DEFS+= UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE UIRCD_GROUP @@ -69,13 +69,14 @@ UIRCD_GROUP?= uircd UIRCD_HOST?= localhost UIRCD_HOME?= ${VARBASE}/unrealircd -DOC_FILES= doc/Authors doc/coding-guidelines doc/tao.of.irc LICENSE +DOC_FILES= doc/Authors doc/coding-guidelines doc/tao.of.irc LICENSE -CONF_FILES_PERMS= ${IRCD_EG}/example.conf ${UIRCD_HOME}/unrealircd.conf \ +CONF_FILES_PERMS= ${IRCD_EG:Q}/example.conf \ + ${UIRCD_HOME:Q}/unrealircd.conf \ ${UIRCD_USER} ${UIRCD_GROUP} 0660 -PKG_USERS= ${UIRCD_USER}:${UIRCD_GROUP}::UnrealIRCD\ user:${UIRCD_HOME}:${NOLOGIN} -PKG_GROUPS= ${UIRCD_GROUP} +PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q}::UnrealIRCD\ user:${UIRCD_HOME:Q}:${NOLOGIN:Q} +PKG_GROUPS= ${UIRCD_GROUP:Q} RCD_SCRIPTS= unrealircd MESSAGE_SRC+= ${WRKDIR}/.MESSAGE_SRC @@ -91,8 +92,9 @@ SUBST_SED.homedir= -e "s|src/modules|${I -e "s|include \"|include \"${IRCD_SHARE}/|g" SUBST_MESSAGE.homedir= Fixing home directory of the IRC server. -OWN_DIRS_PERMS+= ${UIRCD_HOME} ${UIRCD_USER} ${UIRCD_GROUP} 0770 -OWN_DIRS_PERMS+= ${UIRCD_HOME}/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0770 +OWN_DIRS_PERMS+= ${UIRCD_HOME:Q} ${UIRCD_USER:Q} ${UIRCD_GROUP:Q} 0770 +OWN_DIRS_PERMS+= ${UIRCD_HOME:Q}/tmp ${UIRCD_USER:Q} \ + ${UIRCD_GROUP:Q} 0770 .if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED=YES @@ -103,34 +105,35 @@ INSTALL_UNSTRIPPED=YES .include "../../devel/tre/buildlink3.mk" post-build: - @${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC + @${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC .if !empty(PKG_OPTIONS:Minet6) - @${CP} ${PKGDIR}/MESSAGE.inet6 ${WRKDIR}/.MESSAGE_SRC.inet6 + @${CP} ${PKGDIR:Q}/MESSAGE.inet6 ${WRKDIR:Q}/.MESSAGE_SRC.inet6 .endif do-install: ${INSTALL_DATA_DIR} ${IRCD_SHARE} - ${INSTALL_DATA_DIR} ${IRCD_SHARE}/networks - ${INSTALL_DATA_DIR} ${IRCD_SHARE}/aliases - ${INSTALL_DATA_DIR} ${IRCD_SHARE}/modules - ${INSTALL_DATA_DIR} ${IRCD_DOCS} - ${INSTALL_DATA_DIR} ${IRCD_EG} - - ${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/networks/*.network ${IRCD_SHARE}/networks - ${INSTALL_DATA} ${WRKSRC}/networks/networks.ndx ${IRCD_SHARE}/networks - ${INSTALL_SCRIPT} ${WRKSRC}/networks/makenet ${IRCD_SHARE}/networks - ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${IRCD_SHARE}/aliases - ${INSTALL_DATA} ${WRKSRC}/badwords*.conf ${IRCD_SHARE} - ${INSTALL_DATA} ${WRKSRC}/help.* ${IRCD_SHARE} - ${INSTALL_DATA} ${WRKSRC}/doc/help.* ${IRCD_SHARE} - ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${IRCD_SHARE} - ${INSTALL_DATA} ${WRKSRC}/src/modules/*.so ${IRCD_SHARE}/modules - ${INSTALL_DATA} ${WRKSRC}/doc/unreal32docs.* ${IRCD_DOCS}; - ${INSTALL_DATA} ${WRKSRC}/doc/example.* ${IRCD_EG} - - for f in ${DOC_FILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${IRCD_DOCS}; \ - done + ${INSTALL_DATA_DIR} ${IRCD_SHARE:Q}/networks + ${INSTALL_DATA_DIR} ${IRCD_SHARE:Q}/aliases + ${INSTALL_DATA_DIR} ${IRCD_SHARE:Q}/modules + ${INSTALL_DATA_DIR} ${IRCD_DOCS:Q} + ${INSTALL_DATA_DIR} ${IRCD_EG:Q} + + ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ircd ${PREFIX:Q}/sbin + ${INSTALL_DATA} ${WRKSRC:Q}/networks/*.network ${IRCD_SHARE:Q}/networks + ${INSTALL_DATA} ${WRKSRC:Q}/networks/networks.ndx \ + ${IRCD_SHARE:Q}/networks + ${INSTALL_SCRIPT} ${WRKSRC:Q}/networks/makenet ${IRCD_SHARE:Q}/networks + ${INSTALL_DATA} ${WRKSRC:Q}/aliases/*.conf ${IRCD_SHARE:Q}/aliases + ${INSTALL_DATA} ${WRKSRC:Q}/badwords*.conf ${IRCD_SHARE:Q} + ${INSTALL_DATA} ${WRKSRC:Q}/help.* ${IRCD_SHARE:Q} + ${INSTALL_DATA} ${WRKSRC:Q}/doc/help.* ${IRCD_SHARE:Q} + ${INSTALL_DATA} ${WRKSRC:Q}/spamfilter.conf ${IRCD_SHARE:Q} + ${INSTALL_DATA} ${WRKSRC:Q}/src/modules/*.so ${IRCD_SHARE:Q}/modules + ${INSTALL_DATA} ${WRKSRC:Q}/doc/unreal32docs.* ${IRCD_DOCS:Q} + ${INSTALL_DATA} ${WRKSRC:Q}/doc/example.* ${IRCD_EG:Q} + +. for f in ${DOC_FILES} + ${INSTALL_DATA} ${WRKSRC:Q}/${f:Q} ${IRCD_DOCS:Q} +. endfor .include "../../mk/bsd.pkg.mk"