diff options
| author | adrianp <adrianp> | 2008-06-13 23:15:33 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2008-06-13 23:15:33 +0000 |
| commit | 11351fcfba41ff4d5811e8f0e33c3d122520bd79 (patch) | |
| tree | 63ad3c7a416a548367d198742caa2d122bfdeebf /chat | |
| parent | 92df13ef22ff4f59ebf5a6dfde08e3c6a436bb8a (diff) | |
| download | pkgsrc-11351fcfba41ff4d5811e8f0e33c3d122520bd79.tar.gz | |
More chroot build fixes from Michael Stapelberg.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/unrealircd/Makefile | 21 | ||||
| -rw-r--r-- | chat/unrealircd/options.mk | 9 |
2 files changed, 21 insertions, 9 deletions
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile index 6ee248b5bb7..6fc8d2bf238 100644 --- a/chat/unrealircd/Makefile +++ b/chat/unrealircd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2008/04/07 18:21:29 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2008/06/13 23:15:33 adrianp Exp $ DISTNAME= Unreal3.2.7 PKGNAME= unrealircd-3.2.7 @@ -38,7 +38,6 @@ CONFIGURE_ENV+= CARESLIBS='-lcares' CONFIGURE_ARGS+= --with-dpath=${UIRCD_HOME:Q} CONFIGURE_ARGS+= --with-spath=${PREFIX:Q}/sbin/ircd CONFIGURE_ARGS+= --with-permissions=0660 -CONFIGURE_ARGS+= --enable-dynamic-linking CONFIGURE_ARGS+= --with-hostname=${UIRCD_HOST:Q} CONFIGURE_ARGS+= --with-listen=${UIRCD_LISTEN:Q} @@ -81,8 +80,8 @@ CONF_FILES_PERMS= ${IRCD_EG:Q}/example.conf \ PKG_USERS_VARS+= UIRCD_USER PKG_GROUPS_VARS+= UIRCD_GROUP -PKG_GROUPS= ${UIRCD_GROUP:Q} -PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q} +PKG_GROUPS= ${UIRCD_GROUP:Q} +PKG_USERS= ${UIRCD_USER:Q}:${UIRCD_GROUP:Q} PKG_GECOS.${UIRCD_USER}= UnrealIRCD user PKG_HOME.${UIRCD_USER}= ${UIRCD_HOME} @@ -102,9 +101,20 @@ SUBST_SED.homedir= -e "s|src/modules|${IRCD_SHARE}/modules|g" SUBST_SED.homedir+= -e "s|include \"|include \"${IRCD_SHARE}/|g" SUBST_MESSAGE.homedir= Fixing home directory of the IRC server. +.if !empty(PKG_OPTIONS:Munrealircd-chroot) +SUBST_CLASSES+= chroot +SUBST_STAGE.chroot= pre-install +SUBST_FILES.chroot= ${WRKDIR}/unrealircd +SUBST_SED.chroot= -e "s|unrealircd_user=|\#unrealircd_user=|g" +SUBST_SED.chroot+= -e "s|unrealircd_group=|\#unrealircd_group=|g" +SUBST_MESSAGE.chroot= Fixing chroot installation. +.endif + 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 +INSTALLATION_DIRS= sbin ${IRCD_DOCS} ${IRCD_EG} ${IRCD_SHARE}/aliases \ + ${IRCD_SHARE}/modules ${IRCD_SHARE}/networks .if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED=YES @@ -120,9 +130,6 @@ post-build: ${CP} ${PKGDIR:Q}/MESSAGE.inet6 ${WRKDIR:Q}/.MESSAGE_SRC.inet6 .endif -INSTALLATION_DIRS= sbin ${IRCD_DOCS} ${IRCD_EG} ${IRCD_SHARE}/aliases \ - ${IRCD_SHARE}/modules ${IRCD_SHARE}/networks - do-install: ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ircd ${DESTDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC:Q}/networks/*.network \ diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk index be47622a096..f61e2d3941d 100644 --- a/chat/unrealircd/options.mk +++ b/chat/unrealircd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2006/07/18 22:43:36 adrianp Exp $ +# $NetBSD: options.mk,v 1.10 2008/06/13 23:15:33 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.unrealircd @@ -75,7 +75,12 @@ CONFIGURE_ARGS+= --enable-libcurl=${PREFIX:Q} ### CHROOTDIR is defined as ${IRCD_HOME}. ### .if !empty(PKG_OPTIONS:Munrealircd-chroot) -CFLAGS+= -DCHROOTDIR +CFLAGS+= -DCHROOTDIR +CFLAGS+= -DIRC_USER=\"${UIRCD_USER}\" +CFLAGS+= -DIRC_GROUP=\"${UIRCD_GROUP}\" +CONFIGURE_ARGS+= --disable-dynamic-linking +.else +CONFIGURE_ARGS+= --enable-dynamic-linking .endif ### |