diff options
Diffstat (limited to 'news')
| -rw-r--r-- | news/inn/Makefile | 16 | ||||
| -rw-r--r-- | news/inn/pkg-install | 6 |
2 files changed, 20 insertions, 2 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index e7675fde5c78..3310415e793d 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -45,6 +45,18 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/man \ --enable-ipv6 \ --with-etc-dir=${ETC_DIR} +# Attempt to avoid failures later on, when +# makedbz is executed: we need a valid hostname. + +.if exists(/bin/echo) && exists(/bin/hostname) +HOSTNAME!= `/bin/echo /bin/hostname` +HOSTNAME:= ${HOSTNAME:C/[^\.]//g} + +. if ${HOSTNAME} == "" +IGNORE= requires a fully-qualified hostname in order to build +. endif +.endif + .if defined(WITH_BERKELEYDB) CONFIGURE_ARGS+= --with-berkeleydb . if !defined(WITH_BDB_VER) @@ -149,7 +161,7 @@ post-patch: .endif pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: .if !defined(WITHOUT_STRIP) @@ -184,6 +196,6 @@ post-install: ${MV} history.n.$${s} history.$${s} ; \ done ; \ fi) - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE + @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE .include <bsd.port.post.mk> diff --git a/news/inn/pkg-install b/news/inn/pkg-install index 08896386832e..4d0029184e9c 100644 --- a/news/inn/pkg-install +++ b/news/inn/pkg-install @@ -55,6 +55,12 @@ case $2 in touch ${NEWSBASE}/db.dist/${f##*/} done fi + + # Fix permissions + + for f in ${NEWSBASE}/etc/*.ctl ${NEWSBASE}/etc/readers.conf; do + chmod 640 ${f} + done else fc=`ls ${NEWSBASE}/db/* 2>/dev/null | wc -l` |