Index: head/german/unix-connect/Makefile =================================================================== --- head/german/unix-connect/Makefile (revision 371650) +++ head/german/unix-connect/Makefile (revision 371651) @@ -1,74 +1,79 @@ # $FreeBSD$ PORTNAME= unix-connect PORTVERSION= 0.95 CATEGORIES= german comms news mail MASTER_SITES= ftp://ftp.dinoex.org/pub/unix-connect/ \ SF MAINTAINER= dinoex@FreeBSD.org COMMENT= Unix-Connect - mail+news-gateway for Zconnect (tm) BUILD_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz LICENSE_COMB= multi LICENSE= GPLv2 BSD3CLAUSE MANUAL_PACKAGE_BUILD= needs hostname 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 CONFIGURE_ARGS+=--enable-testing CFLAGS+= -g CFLAGS:= ${CFLAGS:S/-O[0-9]*//g} # gcc generates broken code in uwsmtp DOC1= README INSTALL TODO ChangeLog ChangeLog.configure OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= MAIL NEWS OPTIONS_SINGLE_MAIL= SENDMAIL POSTFIX QMAIL SMAIL NO_MAIL OPTIONS_SINGLE_NEWS= CNEWS INN NO_NEWS OPTIONS_DEFAULT=SENDMAIL CNEWS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes SENDMAIL_DESC= build mail scripts for sendmail POSTFIX_DESC= build mail scripts for postfix QMAIL_DESC= build mail scripts for qmail SMAIL_DESC= build mail scripts for smail NOMAIL_DESC= no mail scripts CNEWS_DESC= build news scripts for cnews INN_DESC= build news scripts for inn NO_NEWS_DESC= no news scripts SENDMAIL_CONFIGURE_ON= --with-mail=sendmail POSTFIX_CONFIGURE_ON= --with-mail=postfix QMAIL_CONFIGURE_ON= --with-mail=qmail SMAIL_CONFIGURE_ON= --with-mail=smail NOMAIL_CONFIGURE_ON= --with-mail=no CNEWS_CONFIGURE_ON= --with-news=cnews INN_CONFIGURE_ON= --with-news=inn NO_NEWS_CONFIGURE_ON= --with-news=no .include pre-install: ${MKDIR} ${STAGEDIR}/var/spool post-install: .if ${PORT_OPTIONS:MCNEWS} ${INSTALL_SCRIPT} ${WRKSRC}/mail-and-news/cnews/viazconnect \ ${STAGEDIR}${PREFIX}/libexec/uconnect/ .endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC1:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ ${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - .endif .include Index: head/german/unix-connect/files/patch-Makefile.in =================================================================== --- head/german/unix-connect/files/patch-Makefile.in (revision 371650) +++ head/german/unix-connect/files/patch-Makefile.in (revision 371651) @@ -1,17 +1,19 @@ --- 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 \ - mkdir $(SPOOLDIR)/netcall; \ - chown $(USER) $(SPOOLDIR)/netcall; fi + mkdir $(DESTDIR)$(SPOOLDIR)/netcall; \ + chown $(USER) $(DESTDIR)$(SPOOLDIR)/netcall; fi for dir in $(SUBDIRS); do \ (cd $$dir && $(MAKE) -$(MAKEFLAGS) install) || exit $$? ; done Index: head/german/unix-connect/pkg-plist =================================================================== --- head/german/unix-connect/pkg-plist (revision 371650) +++ head/german/unix-connect/pkg-plist (revision 371651) @@ -1,67 +1,72 @@ libexec/uconnect/januslogin libexec/uconnect/receiver libexec/uconnect/zcall libexec/uconnect/uuwnews libexec/uconnect/uuwsmtp libexec/uconnect/uursmtp libexec/uconnect/zconsplit libexec/uconnect/anruf libexec/uconnect/auspack libexec/uconnect/einpack libexec/uconnect/import libexec/uconnect/list-systems libexec/uconnect/prearc libexec/uconnect/uumlist libexec/uconnect/bsmtp libexec/uconnect/rcsmtp libexec/uconnect/rgsmtp libexec/uconnect/rsmtp libexec/uconnect/cron.d.hourly libexec/uconnect/logrotate.d.entry libexec/uconnect/uurnews %%SENDMAIL%%libexec/uconnect/mail.uuconnect %%SENDMAIL%%libexec/uconnect/zbatchsmtp %%POSTFIX%%libexec/uconnect/zbatchsmtp %%POSTFIX%%libexec/uconnect/run_as %%QMAIL%%libexec/uconnect/zbatchsmtp %%SMAIL%%libexec/uconnect/zbatchsmtp %%CNEWS%%libexec/uconnect/viazconnect %%INN%%libexec/uconnect/send-zcon etc/uconnect/alias etc/uconnect/approved etc/uconnect/autoeintrag.zconnect etc/uconnect/config 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 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.OLD %%PORTDOCS%%%%DOCSDIR%%/POLICY %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.systeme %%PORTDOCS%%%%DOCSDIR%%/THANX %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/bnews.patch %%PORTDOCS%%%%DOCSDIR%%/changes.doc %%PORTDOCS%%%%DOCSDIR%%/ger-texinfo.tex %%PORTDOCS%%%%DOCSDIR%%/iso8859-1.tex %%PORTDOCS%%%%DOCSDIR%%/lizenz.deutsch %%PORTDOCS%%%%DOCSDIR%%/texinfo.tex %%PORTDOCS%%%%DOCSDIR%%/unix-connect.dvi %%PORTDOCS%%%%DOCSDIR%%/unix-connect.texinfo %%PORTDOCS%%%%DOCSDIR%%/xpoint.dok %%PORTDOCS%%%%DOCSDIR%%/zcon31.changes %%PORTDOCS%%%%DOCSDIR%%/zconnect.doc