- support INSTALL_AS_USER

- fix stagedir check
- restore ownership
This commit is contained in:
Dirk Meyer 2014-10-28 21:37:02 +00:00
parent bc7f065fda
commit d386f79db2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=371651
3 changed files with 16 additions and 4 deletions

View File

@ -20,8 +20,13 @@ NEED_ROOT= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
.if !defined(INSTALL_AS_USER)
CONFIGURE_ARGS+=--with-user=news
CONFIGURE_ARGS+=--with-group=dialer
.else
CONFIGURE_ARGS+=--with-user=`id -u -n`
CONFIGURE_ARGS+=--with-group=`id -g -n`
.endif
CONFIGURE_ARGS+=--with-execdir=${PREFIX}/libexec/uconnect
CONFIGURE_ARGS+=--with-confdir=${PREFIX}/etc/uconnect
CONFIGURE_ARGS+=--with-spooldir=/var/spool/uconnect

View File

@ -1,10 +1,12 @@
--- Makefile.in.orig 2001-10-01 20:27:36.000000000 +0200
+++ Makefile.in 2013-11-29 05:39:06.000000000 +0100
@@ -56,11 +56,11 @@
+++ Makefile.in 2014-10-28 22:21:15.000000000 +0100
@@ -55,12 +55,12 @@
install:
for dir in $(TARGETDIRS); do \
if test ! -d $$dir; then \
- if test ! -d $$dir; then \
- mkdir $$dir; chown $(USER):$(GROUP) $$dir; fi \
+ if test ! -d $(DESTDIR)$$dir; then \
+ mkdir $(DESTDIR)$$dir; chown $(USER):$(GROUP) $(DESTDIR)$$dir; fi \
done
if test ! -d $(SPOOLDIR)/netcall; then \

View File

@ -35,15 +35,20 @@ etc/uconnect/myself.zconnect
etc/uconnect/systems.sample
etc/uconnect/xprogs
etc/uconnect/zconnecthosts
@owner news
@group dialer
@dir etc/uconnect
@dir etc/uconnect/systems
@dir /var/spool/uconnect/backin
@dir /var/spool/uconnect/backout
@dir /var/spool/uconnect/error
@dir /var/spool/uconnect/locks
@dir /var/spool/uconnect/logfiles
@dir /var/spool/uconnect/netcall
@dir /var/spool/uconnect/rsmtp
@dir /var/spool/uconnect
@group
@dir /var/spool/uconnect/netcall
@owner
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.configure
%%PORTDOCS%%%%DOCSDIR%%/INSTALL