Attachment 147040 Details for Bug 193450 – [request maintainer] STAGE

[patch] [request maintainer] STAGE

2014-09-07.diff (text/plain), 5.20 KB, created by Chris Hutchinson on 2014-09-08 04:13:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-09-08 04:13:35 UTC

Size: 5.20 KB

patch

obsolete

>Index: spread4/Makefile
>===================================================================
>--- spread4/Makefile	(revision 366693)
>+++ spread4/Makefile	(working copy)
>@@ -7,7 +7,7 @@
> MASTER_SITES=	LOCAL/ohauer
> DISTNAME=	spread-src-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	portmaster@bsdforge.com
> COMMENT=	The Spread Group Communication System, a network toolkit
> 
> GNU_CONFIGURE=	yes
>@@ -27,57 +27,43 @@
> 
> PKGMESSAGE=	${WRKSRC}/license.txt
> 
>-DOCFILES=	DynamicConfiguration.txt Flush_or_SpreadAPI.txt \
>-		MultithreadedClients.txt Short_Buffer_Handling.txt \
>-		TODO PORTING
>-MAN1=		spflooder.1 spmonitor.1 spread.1 sptuser.1 spuser.1
>-MAN3=		SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \
>-		SP_error.3 SP_get_memb_info.3 SP_get_vs_set_members.3 \
>-		SP_get_vs_sets_info.3 SP_join.3 SP_kill.3 \
>-		SP_leave.3 SP_multicast.3 SP_multigroup_multicast.3 \
>-		SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 \
>-		SP_scat_get_memb_info.3 SP_scat_get_vs_set_members.3 \
>-		SP_scat_get_vs_sets_info.3 SP_scat_multicast.3 \
>-		SP_scat_receive.3 SP_version.3 libspread.3
>+OPTIONS_DEFINE=	DOCS
>+DOCS=	DynamicConfiguration.txt Flush_or_SpreadAPI.txt \
>+MultithreadedClients.txt Short_Buffer_Handling.txt TODO PORTING
>+PORTDOCS=	${DOCS} LICENSE
> 
>-NO_STAGE=	yes
>+.include <bsd.port.options.mk>
>+
> .include <bsd.port.pre.mk>
> 
> post-extract:
>-		@${REINPLACE_CMD} -e 's|INSTALLSUBDIRS=daemon docs|INSTALLSUBDIRS=daemon|' \
>-		${WRKSRC}/Makefile.in
>-
>+	@${REINPLACE_CMD} -e 's|INSTALLSUBDIRS=daemon docs|INSTALLSUBDIRS=daemon|' \
>+	${WRKSRC}/Makefile.in
> post-install:
>+	(cd ${STAGEDIR}${PREFIX}/lib/ && ${STRIP_CMD} libspread.so.3.0.0 libspread-core.so.3.0.0 libtspread-core.so.3.0.0)
> 	${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.conf \
>-		${PREFIX}/etc/spread.conf.sample
>+		${STAGEDIR}${PREFIX}/etc/spread.conf.sample
> 	${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.access_ip \
>-		${PREFIX}/etc/spread.access_ip.sample
>+		${STAGEDIR}${PREFIX}/etc/spread.access_ip.sample
> 
>-.if !exists(${PREFIX}/etc/spread.conf)
>+.if !exists(${STAGEDIR}${PREFIX}/etc/spread.conf)
> 	${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.conf \
>-		${PREFIX}/etc/spread.conf
>+		${STAGEDIR}${PREFIX}/etc/spread.conf
> .endif
>-
>-.if !exists(${PREFIX}/etc/spread.access_ip)
>+.if !exists(${STAGEDIR}${PREFIX}/etc/spread.access_ip)
> 	${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.access_ip \
>-		${PREFIX}/etc/spread.access_ip
>+		${STAGEDIR}${PREFIX}/etc/spread.access_ip
> .endif
>-
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-.for f in ${DOCFILES}
>-	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
>-.endfor
>+	(cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ./*.1 ${STAGEDIR}${PREFIX}/man/man1/)
>+	(cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ./*.3 ${STAGEDIR}${PREFIX}/man/man3/)
>+.if ${PORT_OPTIONS:MDOCS}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}/LICENSE
> .endif
>-
>-.for f in ${MAN1}
>-	${INSTALL_MAN} ${WRKSRC}/docs/${f} ${LOCALBASE}/man/man1/
>-.endfor
>-
>-.for f in ${MAN3}
>-	${INSTALL_MAN} ${WRKSRC}/docs/${f} ${LOCALBASE}/man/man3/
>-.endfor
>-	@${INSTALL} -m 750 -o ${USERS} -g ${GROUPS} -d ${RUNDIR}
>+	@${INSTALL} -m 750 -d ${STAGEDIR}${RUNDIR}
> 	@${CAT} ${PKGMESSAGE}
>+compress-man:
>+MANCOMPRESSED=	no
> 
> .include <bsd.port.post.mk>
>Index: spread4/pkg-plist
>===================================================================
>--- spread4/pkg-plist	(revision 366693)
>+++ spread4/pkg-plist	(working copy)
>@@ -3,12 +3,8 @@
> bin/spmonitor
> bin/sptuser
> bin/spuser
>-@unexec if cmp -s %D/etc/spread.access_ip.sample %D/etc/spread.access_ip; then rm -f %D/etc/spread.access_ip; fi
>-etc/spread.access_ip.sample
>-@exec if [ ! -f %D/etc/spread.access_ip ] ; then cp -p %D/%F %B/spread.access_ip; fi
>-@unexec if cmp -s %D/etc/spread.conf.sample %D/etc/spread.conf; then rm -f %D/etc/spread.conf; fi
>-etc/spread.conf.sample
>-@exec if [ ! -f %D/etc/spread.conf ] ; then cp -p %D/%F %B/spread.conf; fi
>+@sample etc/spread.access_ip.sample
>+@sample etc/spread.conf.sample
> include/fl.h
> include/sp.h
> include/sp_events.h
>@@ -26,12 +22,33 @@
> lib/libtspread-core.so.3
> lib/libtspread-core.so.3.0.0
> sbin/spread
>-%%PORTDOCS%%%%DOCSDIR%%/DynamicConfiguration.txt
>-%%PORTDOCS%%%%DOCSDIR%%/Flush_or_SpreadAPI.txt
>-%%PORTDOCS%%%%DOCSDIR%%/MultithreadedClients.txt
>-%%PORTDOCS%%%%DOCSDIR%%/Short_Buffer_Handling.txt
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/PORTING
>+man/man1/spflooder.1
>+man/man1/spmonitor.1
>+man/man1/spread.1
>+man/man1/sptuser.1
>+man/man1/spuser.1
>+man/man3/SP_connect.3
>+man/man3/SP_disconnect.3
>+man/man3/SP_equal_group_ids.3
>+man/man3/SP_error.3
>+man/man3/SP_get_memb_info.3
>+man/man3/SP_get_vs_set_members.3
>+man/man3/SP_get_vs_sets_info.3
>+man/man3/SP_join.3
>+man/man3/SP_kill.3
>+man/man3/SP_leave.3
>+man/man3/SP_multicast.3
>+man/man3/SP_multigroup_multicast.3
>+man/man3/SP_multigroup_scat_multicast.3
>+man/man3/SP_poll.3
>+man/man3/SP_receive.3
>+man/man3/SP_scat_get_memb_info.3
>+man/man3/SP_scat_get_vs_set_members.3
>+man/man3/SP_scat_get_vs_sets_info.3
>+man/man3/SP_scat_multicast.3
>+man/man3/SP_scat_receive.3
>+man/man3/SP_version.3
>+man/man3/libspread.3
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @exec install -m 750 -o %%USERS%% -g %%GROUPS%% -d %%RUNDIR%%
> @dirrmtry %%RUNDIR%%

Actions: View | Diff

Attachments on bug 193450: 147040 | 147041 | 147042 | 147043 | 147044 | 147149 | 147150