svn commit: r371651 - in head/german/unix-connect: . files

[Dirk Meyer]

Author: dinoex
Date: Tue Oct 28 21:37:02 2014
New Revision: 371651
URL: https://svnweb.freebsd.org/changeset/ports/371651
QAT: https://qat.redports.org/buildarchive/r371651/

Log:
  - support INSTALL_AS_USER
  - fix stagedir check
  - restore ownership

Modified:
  head/german/unix-connect/Makefile
  head/german/unix-connect/files/patch-Makefile.in
  head/german/unix-connect/pkg-plist

Modified: head/german/unix-connect/Makefile
==============================================================================
--- head/german/unix-connect/Makefile	Tue Oct 28 21:16:09 2014	(r371650)
+++ head/german/unix-connect/Makefile	Tue Oct 28 21:37:02 2014	(r371651)
@@ -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

Modified: head/german/unix-connect/files/patch-Makefile.in
==============================================================================
--- head/german/unix-connect/files/patch-Makefile.in	Tue Oct 28 21:16:09 2014	(r371650)
+++ head/german/unix-connect/files/patch-Makefile.in	Tue Oct 28 21:37:02 2014	(r371651)
@@ -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 \

Modified: head/german/unix-connect/pkg-plist
==============================================================================
--- head/german/unix-connect/pkg-plist	Tue Oct 28 21:16:09 2014	(r371650)
+++ head/german/unix-connect/pkg-plist	Tue Oct 28 21:37:02 2014	(r371651)
@@ -35,15 +35,20 @@ etc/uconnect/myself.zconnect
 etc/uconnect/systems.sample
 etc/uconnect/xprogs
 etc/uconnect/zconnecthosts
+ at owner news
+ at group dialer
+ at 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
- at dir /var/spool/uconnect/netcall
 @dir /var/spool/uconnect/rsmtp
 @dir /var/spool/uconnect
+ at group
+ at dir /var/spool/uconnect/netcall
+ at owner
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.configure
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL