4 files changed, 278 insertions, 13 deletions

diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index 91f2185bb251..04637e51368e 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -13,9 +13,10 @@ COMMENT=	Unix-Connect - mail+news-gateway for Zconnect (tm)
 BUILD_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
 
 LICENSE_COMB=	multi
-LICENSE=	GPLv2 BSD
+LICENSE=	GPLv2 BSD3CLAUSE
 
-NO_STAGE=	yes
+MANUAL_PACKAGE_BUILD=	needs hostname
+NEED_ROOT=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 #USE_GMAKE=     yes
@@ -25,21 +26,50 @@ CONFIGURE_ARGS+=--with-group=dialer
 CONFIGURE_ARGS+=--with-execdir=${PREFIX}/libexec/uconnect
 CONFIGURE_ARGS+=--with-confdir=${PREFIX}/etc/uconnect
 CONFIGURE_ARGS+=--with-spooldir=/var/spool/uconnect
-CONFIGURE_ARGS+=--with-mail=sendmail
-CONFIGURE_ARGS+=--with-news=cnews
 CONFIGURE_ARGS+=--enable-testing
 CFLAGS+=	-g
 CFLAGS:=	${CFLAGS:S/-O[0-9]*//g}	# gcc generates broken code in uwsmtp
 
-MANUAL_PACKAGE_BUILD=	needs hostname
+DOC1=	README INSTALL TODO ChangeLog ChangeLog.configure
+
+OPTIONS_DEFINE=
+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 <bsd.port.options.mk>
+
+pre-install:
+	${MKDIR} ${STAGEDIR}/var/spool
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in README INSTALL TODO ChangeLog ChangeLog.configure
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
-.endfor
-	@${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} -C ${DOCSDIR} -xf -
+.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 <bsd.port.mk>
diff --git a/german/unix-connect/files/patch-Makefile b/german/unix-connect/files/patch-Makefile
new file mode 100644
index 000000000000..04f9505210d0
--- /dev/null
+++ b/german/unix-connect/files/patch-Makefile
@@ -0,0 +1,211 @@
+--- etc/Makefile.orig	2000-02-06 21:00:07.000000000 +0100
++++ etc/Makefile	2013-11-29 05:40:51.000000000 +0100
+@@ -18,7 +18,7 @@
+ install:
+ 	for i in $(FILES); do \
+ 	if test ! -f $(ETCDIR)/$$i; then \
+-		$(INSTALL_DATA) $$i $(ETCDIR); \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(ETCDIR); \
+ 	fi; done
+ 
+ uninstall:
+--- gate/Makefile.orig	2001-05-23 08:58:13.000000000 +0200
++++ gate/Makefile	2013-11-29 05:41:23.000000000 +0100
+@@ -48,11 +48,11 @@
+ all:	$(PROGS)
+ 
+ install:	all
+-	$(INSTALL_PROGRAM) uursmtp uuwsmtp uuwnews $(BINDIR)
+-	$(INSTALL_PROGRAM) -m 4555 uurnews $(BINDIR)
++	$(INSTALL_PROGRAM) uursmtp uuwsmtp uuwnews $(DESTDIR)$(BINDIR)
++	$(INSTALL_PROGRAM) -m 4555 uurnews $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(PROGS)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(PROGS)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES) $(PROGS) $(TPROGS)
+--- shell/Makefile.orig	2001-05-23 08:55:45.000000000 +0200
++++ shell/Makefile	2013-11-29 05:50:46.000000000 +0100
+@@ -71,13 +71,13 @@
+ install: $(FILES)
+ 	for i in $(FILESKEEP) ; do \
+ 		if [ ! -e $(BINDIR)/$$i ] ; then \
+-			$(INSTALL_PROGRAM) $$i $(BINDIR) ; \
++			$(INSTALL_PROGRAM) $$i $(DESTDIR)$(BINDIR) ; \
+ 		fi ; \
+ 	done
+-	$(INSTALL_PROGRAM) $(FILESFORCE) $(BINDIR)
++	$(INSTALL_PROGRAM) $(FILESFORCE) $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(FILES)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(FILES)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES)
+--- online/Makefile.orig	2001-05-23 08:55:47.000000000 +0200
++++ online/Makefile	2013-11-29 05:44:29.000000000 +0100
+@@ -52,10 +52,10 @@
+ all:	$(PROGS)
+ 
+ install:	all
+-	$(INSTALL_PROGRAM) $(PROGS) $(BINDIR)
++	$(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(PROGS)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(PROGS)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES) $(PROGS)
+--- rsmtp/Makefile.orig	2000-01-14 22:42:19.000000000 +0100
++++ rsmtp/Makefile	2013-11-29 05:50:02.000000000 +0100
+@@ -19,20 +19,20 @@
+ 	bsmtp
+ 
+ BINMIN	= \
+-	$(BINDIR)/rsmtp \
+-	$(BINDIR)/bsmtp
++	$(DESTDIR)$(BINDIR)/rsmtp \
++	$(DESTDIR)$(BINDIR)/bsmtp
+ 
+ # rules
+ 
+ all:	$(TARMIN)
+ 
+-install:	${BINDIR} \
+-		$(SPOOLDIR)/rsmtp \
++install:	$(DESTDIR)${BINDIR} \
++		$(DESTDIR)$(SPOOLDIR)/rsmtp \
+ 		$(TARMIN) \
+ 		$(BINMIN)
+ 
+ uninstall:
+-	-rm -f $(BINMIN) $(BINDIR)/rgsmtp $(BINDIR)/rcsmtp
++	-rm -f $(BINMIN) $(DESTDIR)$(BINDIR)/rgsmtp $(DESTDIR)$(BINDIR)/rcsmtp
+ 
+ clean:
+ 	-rm -f $(CLEANFILES) $(TARMIN)
+@@ -47,20 +47,20 @@
+ 
+ # install rules
+ 
+-$(BINDIR):
+-	mkdir -p ${BINDIR}
++$(DESTDIR)$(BINDIR):
++	mkdir -p $(DESTDIR)${BINDIR}
+ 
+-$(SPOOLDIR)/rsmtp:
+-	mkdir -p $(SPOOLDIR)/rsmtp
+-	chown $(USER) $(SPOOLDIR)/rsmtp
+-	chmod 1777 $(SPOOLDIR)/rsmtp
++$(DESTDIR)$(SPOOLDIR)/rsmtp:
++	mkdir -p $(DESTDIR)$(SPOOLDIR)/rsmtp
++	chown $(USER) $(DESTDIR)$(SPOOLDIR)/rsmtp
++	chmod 1777 $(DESTDIR)$(SPOOLDIR)/rsmtp
+ 
+-$(BINDIR)/rsmtp: rsmtp
++$(DESTDIR)$(BINDIR)/rsmtp: rsmtp
+ 	$(INSTALL_PROGRAM) rsmtp $@
+-	$(INSTALL_PROGRAM) rsmtp $(BINDIR)/rgsmtp
+-	$(INSTALL_PROGRAM) rsmtp $(BINDIR)/rcsmtp
++	$(INSTALL_PROGRAM) rsmtp $(DESTDIR)$(BINDIR)/rgsmtp
++	$(INSTALL_PROGRAM) rsmtp $(DESTDIR)$(BINDIR)/rcsmtp
+ 
+-$(BINDIR)/bsmtp: bsmtp
++$(DESTDIR)$(BINDIR)/bsmtp: bsmtp
+ 	$(INSTALL_PROGRAM) rsmtp $@
+ 
+ # end of makefile
+--- mail-and-news/inn/Makefile.orig	2000-01-15 21:51:30.000000000 +0100
++++ mail-and-news/inn/Makefile	2013-11-29 05:52:39.000000000 +0100
+@@ -7,10 +7,10 @@
+ all: $(FILES)
+ 
+ install: $(FILES)
+-	$(INSTALL_PROGRAM) $(FILES) $(BINDIR)
++	$(INSTALL_PROGRAM) $(FILES) $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(FILES)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(FILES)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES)
+--- mail-and-news/postfix/Makefile.orig	2002-04-07 13:07:30.000000000 +0200
++++ mail-and-news/postfix/Makefile	2013-11-29 05:53:11.000000000 +0100
+@@ -7,10 +7,10 @@
+ all: $(FILES) README ucpf.pl
+ 
+ install: $(FILES)
+-	$(INSTALL_PROGRAM) $(FILES) $(BINDIR)
++	$(INSTALL_PROGRAM) $(FILES) $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(FILES)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(FILES)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES)
+--- mail-and-news/qmail/Makefile.orig	2000-01-15 22:06:49.000000000 +0100
++++ mail-and-news/qmail/Makefile	2013-11-29 05:53:27.000000000 +0100
+@@ -7,10 +7,10 @@
+ all: $(FILES)
+ 
+ install: $(FILES)
+-	$(INSTALL_PROGRAM) $(FILES) $(BINDIR)
++	$(INSTALL_PROGRAM) $(FILES) $(DESTDIR)$(BINDIR)
+ 	
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(FILES)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(FILES)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES)
+--- mail-and-news/sendmail/Makefile.orig	2001-03-27 07:59:06.000000000 +0200
++++ mail-and-news/sendmail/Makefile	2013-11-29 05:53:48.000000000 +0100
+@@ -41,10 +41,10 @@
+ all: RSMTP $(FILES) uconnect.m4
+ 
+ install: $(FILES)
+-	$(INSTALL_PROGRAM) $(FILES) $(BINDIR)
++	$(INSTALL_PROGRAM) $(FILES) $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(FILES)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(FILES)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES)
+--- mail-and-news/smail/Makefile.orig	2001-03-27 07:59:06.000000000 +0200
++++ mail-and-news/smail/Makefile	2013-11-29 05:54:03.000000000 +0100
+@@ -41,10 +41,10 @@
+ all: $(FILES)
+ 
+ install: $(FILES)
+-	$(INSTALL_PROGRAM) $(FILES) $(BINDIR)
++	$(INSTALL_PROGRAM) $(FILES) $(DESTDIR)$(BINDIR)
+ 	
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(FILES)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(FILES)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES)
+--- tools/Makefile.orig	2001-05-23 08:55:42.000000000 +0200
++++ tools/Makefile	2013-11-29 05:51:27.000000000 +0100
+@@ -44,10 +44,10 @@
+ all:	$(PROGS)
+ 
+ install:	all
+-	$(INSTALL_PROGRAM) $(PROGS) $(BINDIR)
++	$(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(BINDIR)
+ 
+ uninstall:
+-	-cd $(BINDIR) && rm -f $(PROGS)
++	-cd $(DESTDIR)$(BINDIR) && rm -f $(PROGS)
+ 
+ clean:
+ 	-rm -f $(CLEANFILES) $(PROGS)
diff --git a/german/unix-connect/files/patch-Makefile.in b/german/unix-connect/files/patch-Makefile.in
new file mode 100644
index 000000000000..ab1de7f19b74
--- /dev/null
+++ b/german/unix-connect/files/patch-Makefile.in
@@ -0,0 +1,17 @@
+--- 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 @@
+ install:
+ 	for dir in $(TARGETDIRS); do \
+ 		if test ! -d $$dir; then \
+-			mkdir $$dir; chown $(USER):$(GROUP) $$dir; fi \
++			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
+ 
diff --git a/german/unix-connect/pkg-plist b/german/unix-connect/pkg-plist
index af04d4f045dc..762523104f96 100644
--- a/german/unix-connect/pkg-plist
+++ b/german/unix-connect/pkg-plist
@@ -18,9 +18,15 @@ libexec/uconnect/rgsmtp
 libexec/uconnect/rsmtp
 libexec/uconnect/cron.d.hourly
 libexec/uconnect/logrotate.d.entry
-libexec/uconnect/mail.uuconnect
 libexec/uconnect/uurnews
-libexec/uconnect/zbatchsmtp
+%%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
 @dirrm libexec/uconnect
 etc/uconnect/alias
 etc/uconnect/approved
@@ -30,6 +36,7 @@ etc/uconnect/myself.zconnect
 etc/uconnect/systems.sample
 etc/uconnect/xprogs
 etc/uconnect/zconnecthosts
+@exec mkdir %D/etc/uconnect/systems || true
 @dirrm etc/uconnect/systems
 @dirrm etc/uconnect
 @exec mkdir /var/spool/uconnect