5 files changed, 41 insertions, 32 deletions

diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile
index 23c17820c980..4bd3931da300 100644
--- a/sysutils/mcron/Makefile
+++ b/sysutils/mcron/Makefile
@@ -7,19 +7,25 @@
 #
 
 PORTNAME=	mcron
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.2
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.rdmp.org/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	mcron
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	stefan@fh-mainz.de
 COMMENT=	A 100% compatible replacement for Vixie cron
 
-BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	guile>=1.6.4:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 MAKEFILE=	makefile
 
-INFO=	mcron
+INFO=		mcron
+
+# replacement only needed for 1.0.2 - 'mkinstalldirs' will be back in 1.0.3
+post-patch:
+	@${REINPLACE_CMD} 's|./mkinstalldirs|${MKDIR}|g' ${WRKSRC}/makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/mcron/distinfo b/sysutils/mcron/distinfo
index 919b43e9bcf8..261da5353b23 100644
--- a/sysutils/mcron/distinfo
+++ b/sysutils/mcron/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcron-1.0.0.tar.gz) = 9a80fa4afc0abd8560fe8651aa8a9939
-SHA256 (mcron-1.0.0.tar.gz) = eebf8d4ff92ec743435c2d1c1e14eabaf171972b5a8406ba94ccdf41b42b570d
-SIZE (mcron-1.0.0.tar.gz) = 260313
+MD5 (mcron-1.0.2.tar.gz) = c85b2bb3c0f63b31e4399d167785d06e
+SHA256 (mcron-1.0.2.tar.gz) = 10bdb0c416fbbf1a02ce29d28192def54e1d1391fbb9b1e4c926f456b6607b3b
+SIZE (mcron-1.0.2.tar.gz) = 294691
diff --git a/sysutils/mcron/files/patch-makefile.in b/sysutils/mcron/files/patch-makefile.in
index df41413caec9..1ecd651962c3 100644
--- a/sysutils/mcron/files/patch-makefile.in
+++ b/sysutils/mcron/files/patch-makefile.in
@@ -1,14 +1,18 @@
---- makefile.in.bak	Fri Dec 12 00:53:35 2003
-+++ makefile.in	Wed Mar 17 17:10:28 2004
-@@ -693,9 +693,9 @@
- 
+--- makefile.in.orig	Mon Jan  2 13:09:32 2006
++++ makefile.in	Sun Jun 11 18:21:07 2006
+@@ -772,13 +772,11 @@
  install-exec-hook:
- 	rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1
--	$(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT)
-+	$(INSTALL) -m 'u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT)
- 	rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1
--	$(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT)
-+	$(INSTALL) -m 'u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT)
- 	./mkinstalldirs -m 'u=rwx' /var/cron
- 	./mkinstalldirs -m 'u=rwx,og=rx' /var/run
- 	./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@
+ 	@if [ "`id -u`" -eq "0" ]; then \
+ 	   rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
+-	   $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
++	   $(INSTALL) -m='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
+ 	   rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
+-	   $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
++	   $(INSTALL) -m='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
+ 	   ./mkinstalldirs -m 'u=rwx' /var/cron; \
+ 	   ./mkinstalldirs -m 'u=rwx,og=rx' /var/run; \
+-	   ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@; \
+-	   ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@/mcron; \
+     else \
+        echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
+ 	fi
diff --git a/sysutils/mcron/pkg-descr b/sysutils/mcron/pkg-descr
index ef46a0b18181..52a69f1d41f2 100644
--- a/sysutils/mcron/pkg-descr
+++ b/sysutils/mcron/pkg-descr
@@ -12,4 +12,4 @@ the same time simple command execution instructions and very much more flexible
 ones to be composed than the original Vixie format. This has several useful
 advantages over the original idea.
 
-WWW: http://rdmp.org/mcron/ 
+WWW: http://www.gnu.org/software/mcron/
diff --git a/sysutils/mcron/pkg-plist b/sysutils/mcron/pkg-plist
index 102f0486a814..a756e9edfb6a 100644
--- a/sysutils/mcron/pkg-plist
+++ b/sysutils/mcron/pkg-plist
@@ -1,12 +1,11 @@
 bin/cron
 bin/crontab
 bin/mcron
-share/guile/site/mcron/config.scm
-share/guile/site/mcron/core.scm
-share/guile/site/mcron/environment.scm
-share/guile/site/mcron/job-specifier.scm
-share/guile/site/mcron/redirect.scm
-share/guile/site/mcron/vixie-specification.scm
-share/guile/site/mcron/vixie-time.scm
-@dirrm share/guile/site/mcron
-@dirrmtry share/guile/site
+%%DATADIR%%/config.scm
+%%DATADIR%%/core.scm
+%%DATADIR%%/environment.scm
+%%DATADIR%%/job-specifier.scm
+%%DATADIR%%/redirect.scm
+%%DATADIR%%/vixie-specification.scm
+%%DATADIR%%/vixie-time.scm
+@dirrm %%DATADIR%%