- Update to 1.2

- Utilise bsd.squirrelmail.mk

PR:		ports/124268
Submitted by:	self
Approved by:	Gerrit Beine (maintainer)

4 files changed, 28 insertions, 71 deletions

diff --git a/mail/squirrelmail-login_notes-plugin/Makefile b/mail/squirrelmail-login_notes-plugin/Makefile
index 8ec123706ea6..721de5d92286 100644
--- a/mail/squirrelmail-login_notes-plugin/Makefile
+++ b/mail/squirrelmail-login_notes-plugin/Makefile
@@ -4,73 +4,22 @@
 #
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		1.1
-PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
-DIST_SUBDIR=		squirrelmail
+PORTNAME=	login_notes
+PORTVERSION=	1.2
+CATEGORIES=	mail www
+MASTER_SITES=	http://www.squirrelmail.org/plugins/
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
+DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		gerrit.beine@gmx.de
-COMMENT=		Place notes on the login screen
+MAINTAINER=	gerrit.beine@gmx.de
+COMMENT=	Place notes on the login screen
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-			${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
-SQUIRREL_PLUGIN_NAME=	login_notes
+SUB_FILES=	pkg-message
 
-.ifdef SQUIRRELDIR
-PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
-SUB_LIST+=		"SQUIRRELDIR=${SQUIRRELDIR}"
-.else
-.	ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=		${PREFIX}/www/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=www/squirrelmail
-SUB_LIST+=		"SQUIRRELDIR=www/squirrelmail"
-.	else
-SQUIRRELDIR=		${PREFIX}/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=squirrelmail
-SUB_LIST+=		"SQUIRRELDIR=squirrelmail"
-.	endif
-.endif
-
-SUB_FILES=		pkg-message
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
-pre-everything::
-	@${ECHO} ""
-.ifndef WITHOUT_ACTIVATE
-	@${ECHO} "Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you don't want to automatically activate the plug-in set"
-	@${ECHO} "WITHOUT_ACTIVATE=yes"
-.else
-	@${ECHO} "NOT Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you want to automatically activate the plug-in unset"
-	@${ECHO} "WITHOUT_ACTIVATE"
-.endif
-	@${ECHO} ""
-
-do-install:
-	${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
-
-post-install:
-.ifndef WITHOUT_ACTIVATE
-.if exists( ${SQUIRRELDIR}/config/config.php )
-	@${ECHO} "Activating plug-in in SquirrelMail"
-	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-.endif
-.else
-	@${ECHO} "To activate the plug-in in SquirrelMail use"
-	@${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
-.endif
-	@${ECHO} ""
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-login_notes-plugin/distinfo b/mail/squirrelmail-login_notes-plugin/distinfo
index 3cc5df0795e0..619489bed1c4 100644
--- a/mail/squirrelmail-login_notes-plugin/distinfo
+++ b/mail/squirrelmail-login_notes-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/login_notes-1.1-1.4.0.tar.gz) = b6fe516931123230d3fb960803338a20
-SHA256 (squirrelmail/login_notes-1.1-1.4.0.tar.gz) = d53e8593e52e2053bde50f89356ed80ac3a31a7fff9761c5281cb52ad2fccef1
-SIZE (squirrelmail/login_notes-1.1-1.4.0.tar.gz) = 8200
+MD5 (squirrelmail/login_notes-1.2-1.4.0.tar.gz) = a1e372b8eda352887ca9fe93a9384038
+SHA256 (squirrelmail/login_notes-1.2-1.4.0.tar.gz) = 3f44b6246528fb65962f1e988b2b7a57d986c818a4ed298dd7aff0d5382bf829
+SIZE (squirrelmail/login_notes-1.2-1.4.0.tar.gz) = 11949
diff --git a/mail/squirrelmail-login_notes-plugin/files/pkg-message.in b/mail/squirrelmail-login_notes-plugin/files/pkg-message.in
index c8e521e65bec..c3309b9090ed 100644
--- a/mail/squirrelmail-login_notes-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-login_notes-plugin/files/pkg-message.in
@@ -1,5 +1,5 @@
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/login_notes/config.php.sample
+%%PREFIX%%/%%SQUIRRELDIR%%/plugins/login_notes/config.sample.php
 to
 %%PREFIX%%/%%SQUIRRELDIR%%/plugins/login_notes/config.php
 and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-login_notes-plugin/pkg-plist b/mail/squirrelmail-login_notes-plugin/pkg-plist
index 9d957b9032a0..1a5cec0d93aa 100644
--- a/mail/squirrelmail-login_notes-plugin/pkg-plist
+++ b/mail/squirrelmail-login_notes-plugin/pkg-plist
@@ -2,9 +2,17 @@
 %%SQUIRRELDIR%%/plugins/login_notes/COPYING
 %%SQUIRRELDIR%%/plugins/login_notes/INSTALL
 %%SQUIRRELDIR%%/plugins/login_notes/README
-%%SQUIRRELDIR%%/plugins/login_notes/config.php.sample
+%%SQUIRRELDIR%%/plugins/login_notes/config.sample.php
 %%SQUIRRELDIR%%/plugins/login_notes/functions.php
 %%SQUIRRELDIR%%/plugins/login_notes/index.php
+%%SQUIRRELDIR%%/plugins/login_notes/make_release.sh
 %%SQUIRRELDIR%%/plugins/login_notes/setup.php
+%%SQUIRRELDIR%%/plugins/login_notes/version
+%%SQUIRRELDIR%%/plugins/login_notes/templates/index.php
+%%SQUIRRELDIR%%/plugins/login_notes/templates/default/index.php
+%%SQUIRRELDIR%%/plugins/login_notes/templates/default/top_notes.tpl
+%%SQUIRRELDIR%%/plugins/login_notes/templates/default/bottom_notes.tpl
+@dirrm %%SQUIRRELDIR%%/plugins/login_notes/templates/default
+@dirrm %%SQUIRRELDIR%%/plugins/login_notes/templates/
 @dirrmtry %%SQUIRRELDIR%%/plugins/login_notes/
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin login_notes; fi