Attachment 146233 Details for Bug 192979 – patch-bsdadminscripts.diff

[patch] patch-bsdadminscripts.diff

patch-bsdadminscripts.diff (text/plain), 4.35 KB, created by Carlos J Puga Medina on 2014-08-24 21:53:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-08-24 21:53:15 UTC

Size: 4.35 KB

patch

obsolete

>diff -urN /usr/ports/sysutils/bsdadminscripts.old/Makefile /usr/ports/sysutils/bsdadminscripts/Makefile
>--- /usr/ports/sysutils/bsdadminscripts.old/Makefile	2014-07-06 17:52:25.000000000 +0200
>+++ /usr/ports/sysutils/bsdadminscripts/Makefile	2014-08-24 23:49:27.000000000 +0200
>@@ -3,50 +3,53 @@
> 
> PORTNAME=	bsdadminscripts
> PORTVERSION=	6.1.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	sysutils ports-mgmt
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	cpm@fbsd.es
> COMMENT=	Collection of administration scripts
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
>+LICENSE=	BSD2CLAUSE
>+
> NO_BUILD=	yes
> MANCOMPRESSED=	yes
> 
>-NO_STAGE=	yes
>-
> OPTIONS_DEFINE=	DOCS
> 
>+PORTDOCS=	ABOUT CHANGES INSTALL NOTES THANKS
>+
> .include <bsd.port.options.mk>
> 
>+do-install:
>+	cd ${WRKSRC}/src && ${SH} install.sh \
>+		-prefix=${STAGEDIR}${PREFIX} -ports=${STAGEDIR}${PORTSDIR} -distdir=${STAGEDIR}${DISTDIR}  \
>+		-datadir=${STAGEDIR}${DATADIR} ${EVALDOCS}
>+.for n in pkg_libchk pkg_upgrade uma
>+	${INSTALL_DATA} ${WRKSRC}/src/${n} ${STAGEDIR}${PREFIX}/sbin
>+.endfor
>+	${INSTALL_DATA} ${WRKSRC}/src/buildflags.mk ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/src/buildflags.conf.sample ${STAGEDIR}${PREFIX}/etc
>+	${INSTALL_DATA} ${WRKSRC}/src/uma.conf.sample ${STAGEDIR}${PREFIX}/etc
>+
>+.for f in bsdadminscripts buildflags.awk buildflags.conf buildflags.mk distviper pkg_libchk pkg_upgrade pkg_validate portconfig rcstart uma
>+	${INSTALL_MAN} ${WRKSRC}/src/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>+.endfor
>+
>+post-install:
>+	${MKDIR} ${STAGEDIR}${ETCDIR}
>+	${MV} ${STAGEDIR}${PREFIX}/etc/*.sample ${STAGEDIR}${ETCDIR}
>+	${RM} -rf ${STAGEDIR}${PREFIX}/etc/*.sample
>+
> .if ${PORT_OPTIONS:MDOCS}
>-MAN1=		bsdadminscripts.1 \
>-		buildflags.mk.1 buildflags.conf.1 buildflags.awk.1 \
>-		distviper.1 \
>-		pkg_libchk.1 \
>-		pkg_upgrade.1 \
>-		pkg_validate.1 \
>-		portconfig.1 \
>-		rcstart.1 \
>-		uma.1
>-
>-RC_SCRIPTS=	stop restart status onestart onestop onerestart onestatus
>-PORT_SCRIPTS=	build clean fetch package \
>-		config-recursive fetch-recursive
>-MLINKS+=	${RC_SCRIPTS:S,^,rc,:S,$,.1,:S,^,rcstart.1 ,} \
>-		${PORT_SCRIPTS:S,^,port,:S,$,.1,:S,^,portconfig.1 ,}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> .else
> EVALDOCS=	-nodoc
> .endif
> 
>-plist: patch
>-	@cd ${WRKSRC}; ./plist.sh -nodoc > ${PLIST}
>-	@${ECHO} "@dirrm ${DATADIR_REL}" >> ${PLIST}
>-
>-do-install:
>-	@cd ${WRKSRC}; ./install.sh \
>-		-prefix=${PREFIX} -ports=${PORTSDIR} -distdir=${DISTDIR}  \
>-		-datadir=${DATADIR} ${EVALDOCS}
>+plist:
>+	cd ${WRKSRC}/src && ${SH} plist.sh > ${PLIST}
>+		${ECHO} "@dirrm ${DATADIR_REL}" >> ${PLIST}
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/sysutils/bsdadminscripts.old/files/patch-pkg_libchk /usr/ports/sysutils/bsdadminscripts/files/patch-pkg_libchk
>--- /usr/ports/sysutils/bsdadminscripts.old/files/patch-pkg_libchk	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/sysutils/bsdadminscripts/files/patch-pkg_libchk	2014-08-24 23:48:21.000000000 +0200
>@@ -1,5 +1,5 @@
>---- pkg_libchk.orig	2009-04-19 17:57:16.000000000 +0200
>-+++ pkg_libchk	2013-06-26 22:01:57.000000000 +0200
>+--- src/pkg_libchk.orig	2009-04-19 17:57:16.000000000 +0200
>++++ src/pkg_libchk	2013-06-26 22:01:57.000000000 +0200
> @@ -23,6 +23,8 @@
>  
>  readonly name=pkg_libchk
>diff -urN /usr/ports/sysutils/bsdadminscripts.old/pkg-plist /usr/ports/sysutils/bsdadminscripts/pkg-plist
>--- /usr/ports/sysutils/bsdadminscripts.old/pkg-plist	2014-01-22 16:16:56.000000000 +0100
>+++ /usr/ports/sysutils/bsdadminscripts/pkg-plist	2014-08-24 23:48:21.000000000 +0200
>@@ -1,6 +1,3 @@
>-%%DATADIR%%/buildflags.awk
>-etc/buildflags.conf.sample
>-%%DATADIR%%/buildflags.mk
> sbin/distviper
> sbin/pkg_libchk
> sbin/pkg_upgrade
>@@ -8,7 +5,6 @@
> sbin/portconfig
> sbin/rcstart
> sbin/uma
>-etc/uma.conf.sample
> sbin/rcstatus
> sbin/rcstop
> sbin/rcrestart
>@@ -22,4 +18,20 @@
> sbin/portpackage
> sbin/portconfig-recursive
> sbin/portfetch-recursive
>+man/man1/bsdadminscripts.1.gz
>+man/man1/buildflags.awk.1.gz
>+man/man1/buildflags.conf.1.gz
>+man/man1/buildflags.mk.1.gz
>+man/man1/distviper.1.gz
>+man/man1/pkg_libchk.1.gz
>+man/man1/pkg_upgrade.1.gz
>+man/man1/pkg_validate.1.gz
>+man/man1/portconfig.1.gz
>+man/man1/rcstart.1.gz
>+man/man1/uma.1.gz
>+%%ETCDIR%%/buildflags.conf.sample
>+%%ETCDIR%%/uma.conf.sample
>+%%DATADIR%%/buildflags.awk
>+%%DATADIR%%/buildflags.mk
> @dirrm share/bsdadminscripts
>+@dirrmtry %%ETCDIR%%

Actions: View | Diff

Attachments on bug 192979: 146232 | 146233