Attachment 143364 Details for Bug 190162 – New diff file.

[patch] New diff file.

fcron.diff (text/plain), 5.09 KB, created by Zsolt Udvari on 2014-06-04 13:11:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2014-06-04 13:11:36 UTC

Size: 5.09 KB

patch

obsolete

>diff -ur fcron.orig/Makefile fcron/Makefile
>--- fcron.orig/Makefile	2014-05-24 07:57:35.000000000 +0200
>+++ fcron/Makefile	2014-06-04 15:05:32.000000000 +0200
>@@ -14,9 +14,10 @@
> MAINTAINER=	rde@tavi.co.uk
> COMMENT=	A periodic command scheduler
> 
>+LICENSE=	GPLv2
>+
> GNU_CONFIGURE=	yes
>-USE_GMAKE=	yes
>-USES=		perl5
>+USES=		gmake perl5
> USE_PERL5=	build
> CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --localstatedir=/var \
> 		--with-cflags="${CFLAGS}" \
>@@ -28,10 +29,6 @@
> USE_RC_SUBR=	fcron
> SUB_FILES=	pkg-message
> 
>-MAN1=		fcrontab.1
>-MAN5=		fcron.conf.5 fcrontab.5
>-MAN8=		fcron.8
>-
> PAMDIR?=	/etc/pam.d
> PLIST_SUB+=	PAMDIR=etc/pam.d
> 
>@@ -43,37 +40,34 @@
> DOCSRC=		${WRKSRC}/doc/en
> .endif
> 
>-LICENSE=	GPLv2
>+.include <bsd.port.options.mk>
>+
>+NEED_ROOT=yes
> 
>-NO_STAGE=	yes
> pre-su-install:
> 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/fcron ${PREFIX}/sbin
>-	${INSTALL_PROGRAM} -g fcron -o fcron -m 6111 ${WRKSRC}/fcrontab ${PREFIX}/bin
>-	${INSTALL_PROGRAM} -g fcron -o fcron -m 6111 ${WRKSRC}/fcrondyn ${PREFIX}/bin
>-	${INSTALL_PROGRAM} -g fcron -m 4110 ${WRKSRC}/fcronsighup ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/fcron ${STAGEDIR}${PREFIX}/sbin
>+	${INSTALL_PROGRAM} ${WRKSRC}/fcrontab ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/fcrondyn ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/fcronsighup ${STAGEDIR}${PREFIX}/bin
> .for f in fcron.allow fcron.conf fcron.deny
>-	${INSTALL_DATA} -g fcron -m 640 ${WRKSRC}/files/${f} ${PREFIX}/etc/${f}.dist
>+	${INSTALL_DATA} -g fcron -m 640 ${WRKSRC}/files/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample
> .endfor
>-	${MKDIR} ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${FILESDIR}/fcrontab-* ${WRKSRC}/files/*.pam ${EXAMPLESDIR}
>-	${MKDIR} ${PAMDIR}
>-	[ -f ${PAMDIR}/fcron ] || ${INSTALL_DATA} ${WRKSRC}/files/fcron.pam ${PAMDIR}/fcron
>-	[ -f ${PAMDIR}/fcrontab ] || ${INSTALL_DATA} ${WRKSRC}/files/fcrontab.pam ${PAMDIR}/fcrontab
>+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${FILESDIR}/fcrontab-* ${WRKSRC}/files/*.pam ${STAGEDIR}${EXAMPLESDIR}
>+	${MKDIR} ${STAGEDIR}${PAMDIR}
>+	${INSTALL_DATA} ${WRKSRC}/files/fcron.pam ${STAGEDIR}${PAMDIR}/fcron
>+	${INSTALL_DATA} ${WRKSRC}/files/fcrontab.pam ${STAGEDIR}${PAMDIR}/fcrontab
> .for n in 1 5 8
>-	${INSTALL_MAN} ${MAN${n}:S|^|${DOCSRC}/man/|} ${PREFIX}/man/man${n}
>+	${INSTALL_MAN} ${DOCSRC}/man/*.${n} ${STAGEDIR}${PREFIX}/man/man${n}
> .endfor
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> .  for d in txt HTML
>-	${MKDIR} ${DOCSDIR}/${d}
>-	${INSTALL_DATA} ${DOCSRC}/${d}/* ${DOCSDIR}/${d}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}/${d}
>+	${INSTALL_DATA} ${DOCSRC}/${d}/* ${STAGEDIR}${DOCSDIR}/${d}
> .  endfor
> .endif
> 
>-post-install:
>-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-	@${CAT} ${PKGMESSAGE}
>-
> .include <bsd.port.mk>
>diff -ur fcron.orig/pkg-plist fcron/pkg-plist
>--- fcron.orig/pkg-plist	2014-05-24 07:57:35.000000000 +0200
>+++ fcron/pkg-plist	2014-06-04 15:00:18.000000000 +0200
>@@ -1,16 +1,57 @@
>-bin/fcronsighup
>-bin/fcrontab
>+/%%PAMDIR%%/fcron
>+/%%PAMDIR%%/fcrontab
>+@mode 6111
>+@owner fcron
>+@group fcron
> bin/fcrondyn
>-etc/fcron.allow.dist
>-etc/fcron.conf.dist
>-etc/fcron.deny.dist
>+bin/fcrontab
>+@mode 4110
>+bin/fcronsighup
>+@mode
>+@owner
>+@group
>+@sample etc/fcron.allow.sample
>+@sample etc/fcron.conf.sample
>+@sample etc/fcron.deny.sample
>+etc/rc.d/fcron
>+man/man1/fcrondyn.1.gz
>+man/man1/fcrontab.1.gz
>+man/man5/fcron.conf.5.gz
>+man/man5/fcrontab.5.gz
>+man/man8/fcron.8.gz
> sbin/fcron
>-%%EXAMPLESDIR%%/fcrontab-operator
>-%%EXAMPLESDIR%%/fcrontab-root
>-%%EXAMPLESDIR%%/fcron.pam
>-%%EXAMPLESDIR%%/fcrontab.pam
>-@dirrm %%EXAMPLESDIR%%
>-@cwd /
>-%%PAMDIR%%/fcron
>-%%PAMDIR%%/fcrontab
>-@dirrmtry %%PAMDIR%%
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/LEGALNOTICE.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/changes.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/faq.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/fcron.8.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/fcron.conf.5.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/fcrondyn.1.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/fcrontab.1.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/fcrontab.5.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/fdl.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/gpl.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/how-and-why.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/install.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/manpages.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/readme.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/relnotes.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/thanks.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/todo.html
>+%%PORTDOCS%%%%DOCSDIR%%/HTML/using-fcron.html
>+%%PORTDOCS%%%%DOCSDIR%%/txt/changes.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/faq.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/gpl.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/install.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/readme.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/relnotes.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/thanks.txt
>+%%PORTDOCS%%%%DOCSDIR%%/txt/todo.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcron.pam
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab-operator
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab-root
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fcrontab.pam
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/HTML
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/txt
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 190162: 143036 | 143364