3 files changed, 55 insertions, 135 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 4cd763d71f94..cb19d92c2878 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -10,19 +10,15 @@ COMMENT=	Prayer Webmail System
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	c-client4:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	libc-client4.so:${PORTSDIR}/mail/cclient
 
-USES=		iconv shebangfix gmake perl5
+USES=		iconv shebangfix gmake perl5 uidfix
 USE_PERL5=	build
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 SHEBANG_FILES=	utils/ucsnews.pl \
 		templates/old/make_olist.pl \
 		templates/src/*.pl
 
-MAKE_ENV+=	PORTCFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		PORTLDFLAGS="${LDFLAGS}"
-
 PORTDOCS=	ACCOUNTD CMD_LINE DESIGN DONE DONE-OLD FEATURES ICONLIST \
 		INSTALL LOGS NOTICE README ROADMAP SECURITY TODO
 
@@ -36,22 +32,54 @@ SESSIONCACHE_DESC=	Activate Session Cache
 USERS=		_prayer
 GROUPS=		prayer
 
-MAN5=		prayer.cf.5
-MAN8=		prayer-session.8 prayer-ssl-prune.8 prayer.8
+SESSIONCACHE_USE=	BDB=yes
+LDAP_USE=		OPENLDAP=yes
+TIDY_LIB_DEPENDS=	libtidy-0.99.so:${PORTSDIR}/www/tidy-lib
+
+GID!=		id -g
+DESTDIRNAME=	BROOT
+MAKE_ARGS+=	RW_USER="${UID}" RW_GROUP="${GID}" RO_GROUP="${GID}" RO_USER="${UID}" \
+		CCLIENT_INCLUDE="-I${LOCALBASE}/include/c-client" \
+		CCLIENT_LIBS="-L${LOCALBASE}/lib -lc-client4" \
+		CC="${CC}" \
+		CPPFLAGS="${CFLAGS}" \
+		PREFIX="${PREFIX}/prayer" \
+		BIN_DIR="${PREFIX}/sbin" \
+		PRAYER_CONFIG_FILE="${ETCDIR}/prayer.cf" \
+		ACCOUNTD_CONFIG_FILE="${ETCDIR}/accountd.cf"
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSESSIONCACHE}
-USE_BDB=	yes
+.if ${PORT_OPTIONS:MLDAP_ENABLE}
+MAKE_ARGS+=	LDAP_ENABLE=true \
+		LDAP_INCLUDE="-I${LOCALBASE}/include" \
+		LDAP_LIBS="-L${LOCALBASE}/lib -lldap"
+.else
+MAKE_ARGS+=	LDAP_ENABLE=false
 .endif
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
+.if ${PORT_OPTIONS:MTIDY}
+MAKE_ARGS+=	TIDY_ENABLE=true \
+		TIDY_INCLUDE=-I${LOCALBASE}/include/tidy \
+		TIDY_LIBS="-L${LOCALBASE}/lib -ltidy"
+.else
+MAKE_ARGS+=	TIDY_ENABLE=false
 .endif
 
-.if ${PORT_OPTIONS:MTIDY}
-LIB_DEPENDS+=	tidy-0.99.0:${PORTSDIR}/www/tidy-lib
+.if ${PORT_OPTIONS:MSSL}
+MAKE_ARGS+=	CCLIENT_SSL_ENABLE=true \
+		SSL_ENABLE=true
+.else
+MAKE_ARGS+=	CCLIENT_SSL_ENABLE=false \
+		SSL_ENABLE=false
+.endif
+
+.if ${PORT_OPTIONS:MSESSION_CACHE}
+MAKE_ARGS+=	SESSION_CACHE_ENABLE=true \
+		DB_INCLUDE=-I${BDB_INCLUDE_DIR} \
+		DB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}"
+.else
+MAKE_ARGS+=	SESSION_CACHE_ENABLE=false
 .endif
 
 pre-patch:
@@ -63,41 +91,15 @@ post-patch:
 # change the user in the default config and cylog util
 	@${REINPLACE_CMD} "s#prayer_user           = \"prayer\"#prayer_user           = \"_prayer\"#" ${WRKSRC}/files/etc/prayer.cf.SRC
 	@${REINPLACE_CMD} "s#\"prayer\" \"prayer\"#\"_prayer\" \"prayer\"#" ${WRKSRC}/utils/prayer-cyclog.SRC
-	@${REINPLACE_CMD} "/^CC\s.*/d" ${WRKSRC}/Config
-	@${REINPLACE_CMD} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/Config
-
-post-configure:
-.if ${PORT_OPTIONS:MSESSIONCACHE}
-	@${REINPLACE_CMD} "s|^#DB_INCLUDE=.*|DB_INCLUDE=-I${BDB_INCLUDE_DIR}|" ${WRKSRC}/Config
-	@${REINPLACE_CMD} "s|^#DB_LIBS=.*|DB_LIBS=-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}|" ${WRKSRC}/Config
-.else
-	@${REINPLACE_CMD} "s#^SESSION_CACHE_ENABLE = true#SESSION_CACHE_ENABLE = false#" ${WRKSRC}/Config
-.endif
-	@${REINPLACE_CMD} "s#^RW_USER    = prayer#RW_USER    = _prayer#" ${WRKSRC}/Config
-
-.if ${PORT_OPTIONS:MSSL}
-	@${REINPLACE_CMD} "s#CCLIENT_SSL_ENABLE   = false#CCLIENT_SSL_ENABLE   = true#" ${WRKSRC}/Config
-.else
-	@${REINPLACE_CMD} "s#^SSL_ENABLE           = true#SSL_ENABLE           = false#" ${WRKSRC}/Config
-.endif
-
-.if ! ${PORT_OPTIONS:MLDAP}
-	@${REINPLACE_CMD} "s#LDAP_ENABLE          = true#LDAP_ENABLE          = false#" ${WRKSRC}/Config
-.endif
-
-.if ! ${PORT_OPTIONS:MTIDY}
-	@${REINPLACE_CMD} "s#TIDY_ENABLE          = true#TIDY_ENABLE          = false#" ${WRKSRC}/Config
-.else
-	@${REINPLACE_CMD} "s#TIDY_INCLUDE=-I/usr/include/tidy#TIDY_INCLUDE=-I${LOCALBASE}/include/tidy#" ${WRKSRC}/Config
-.endif
+	@${REINPLACE_CMD} "s,-liconv,${ICONV_LIB}," ${WRKSRC}/Config
 
 pre-install:
-	@${MKDIR} ${PREFIX}/etc/prayer
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/prayer \
+		${STAGEDIR}${PREFIX}/prayer
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/var/spool/prayer
 
 .include <bsd.port.mk>
diff --git a/mail/prayer/files/patch-Config b/mail/prayer/files/patch-Config
deleted file mode 100644
index a472f343e35b..000000000000
--- a/mail/prayer/files/patch-Config
+++ /dev/null
@@ -1,85 +0,0 @@
---- Config.orig	2010-07-29 10:19:04.982393002 +0200
-+++ Config	2010-07-29 10:21:55.459770746 +0200
-@@ -28,31 +28,31 @@
- 
- ############################################################################
- # Location of compiler
--CC           = gcc
-+#CC           = gcc
- # Location of make program (GNU make required)
- MAKE         = gmake
- # Location of install program (GNU install or compatible required)
- INSTALL      = install
- 
- # Base Compiler options for GCC (use CPPFLAGS and LDFLAGS if passed in)
--ifdef CPPFLAGS
--  BASECFLAGS   = $(CPPFLAGS)
-+ifdef PORTCFLAGS
-+  BASECFLAGS   = $(PORTCFLAGS)
- else
-   BASECFLAGS   = -Wall -g -O2
- endif
- ifdef INCLUDES
-   BASECFLAGS += $(INCLUDES)
- endif
--ifdef LDFLAGS
-- BASELDFLAGS  = $(LDFLAGS)
-+ifdef PORTLDFLAGS
-+ BASELDFLAGS  = $(PORTLDFLAGS)
- else
-  BASELDFLAGS  = -g
- endif
- 
- # Minimal libraries needed by Linux
--BASE_LIBS    = -lcrypt -lutil
-+#BASE_LIBS    = -lcrypt -lutil
- # FreeBSD needs some extra libraries:
--# BASE_LIBS   = -lcrypt -liconv -lutil
-+BASE_LIBS   = -lcrypt -liconv -lutil
- # Solaris needs even more libararies:
- # BASE_LIBS   = -lcrypt -lxnet -lnsl -lsocket
- 
-@@ -93,12 +93,14 @@
- # Following works with the mail/cclient port from FreeBSD
- #
- #CCLIENT_INCLUDE = -I/usr/local/include/c-client
-+CCLIENT_INCLUDE = -I${LOCALBASE}/include/c-client
- #CCLIENT_LIBS    = -L/usr/local/lib -lc-client4
-+CCLIENT_LIBS     = -L${LOCALBASE}/lib -lc-client4
- #
- # Complication:
- #   The FreeBSD port uses PAM and optionally SSL if built WITH_SSL=yes.
- #
--#CCLIENT_SSL_ENABLE  = true
-+CCLIENT_SSL_ENABLE  = true
- #CCLIENT_KERB_ENABLE = true
- 
- ############################################################################
-@@ -116,7 +118,7 @@
- Z_LIBS    = -lz
- 
- # LDAP (required if LDAP_ENABLE set)
--LDAP_INCLUDE =
-+LDAP_INCLUDE = -I${LOCALBASE}/include
- LDAP_LIBS    = -lldap
- 
- # Pam (required if CCLIENT_PAM_ENABLE set)
-@@ -171,7 +173,7 @@
- # Default configuration and permissions does not allow prayer user to
- # update prayer configuration file.
- 
--PREFIX    = /usr/local/prayer
-+PREFIX    = %%PREFIX%%/prayer
- RO_USER   = root
- RO_GROUP  = prayer
- 
-@@ -186,6 +188,6 @@
- PRIVATE_FILE = 0640
- 
- # Location of configuration files and binaries
--PRAYER_CONFIG_FILE   = ${PREFIX}/etc/prayer.cf
--BIN_DIR              = ${PREFIX}/sbin
--ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf
-+PRAYER_CONFIG_FILE   = %%PREFIX%%/etc/prayer/prayer.cf
-+BIN_DIR              = %%PREFIX%%/sbin
-+ACCOUNTD_CONFIG_FILE = %%PREFIX%%/etc/prayer/accountd.cf
diff --git a/mail/prayer/pkg-plist b/mail/prayer/pkg-plist
index ec45657cd1b0..a2a23a632993 100644
--- a/mail/prayer/pkg-plist
+++ b/mail/prayer/pkg-plist
@@ -1,3 +1,9 @@
+etc/prayer/prayer.cf-dist
+etc/prayer/accountd.cf-dist
+man/man5/prayer.cf.5.gz
+man/man8/prayer-session.8.gz
+man/man8/prayer-ssl-prune.8.gz
+man/man8/prayer.8.gz
 prayer/icons/bg-home-menu-top.gif
 prayer/icons/bg-nav-primary.gif
 prayer/icons/bg-tab-left-active.gif
@@ -93,8 +99,6 @@ prayer/static/reset.css
 prayer/static/rssfeed.css
 prayer/static/typography.css
 prayer/static/yellow.css
-etc/prayer/prayer.cf-dist
-etc/prayer/accountd.cf-dist
 prayer/etc/motd.html
 sbin/prayer
 sbin/prayer-db-prune
@@ -114,4 +118,3 @@ sbin/prayer-chroot
 @exec mkdir -p /var/spool/prayer
 @exec chown -R _prayer:prayer /var/spool/prayer
 @dirrmtry /var/spool/prayer
-@stopdaemon prayer