Attachment 81763 Details for Bug 117051 – file.diff

[patch] file.diff

file.diff (text/plain), 9.26 KB, created by Philip M. Gollucci on 2007-10-10 01:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2007-10-10 01:10:01 UTC

Size: 9.26 KB

patch

obsolete

>Index: junkbuster/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/junkbuster/Makefile,v
>retrieving revision 1.27
>diff -u -r1.27 Makefile
>--- junkbuster/Makefile	4 Oct 2007 06:21:45 -0000	1.27
>+++ junkbuster/Makefile	9 Oct 2007 23:41:43 -0000
>@@ -42,7 +42,7 @@
> 	@${INSTALL_DATA} ${WRKSRC}/scookie.ini ${JDIR}/cookiefile.sample
> 	@${INSTALL_DATA} ${WRKSRC}/sforward.ini ${JDIR}/forwardfile.sample
> 	@${INSTALL_DATA} ${WRKSRC}/strust.ini ${JDIR}/trustfile.sample
>-	@$(INSTALL_MAN) ${WRKSRC}/junkbuster.1 $(PREFIX)/man/man1/
>+	@${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1/
> 
> 	@${INSTALL_SCRIPT} ${WRKDIR}/junkbuster.sh \
> 	    ${PREFIX}/etc/rc.d/junkbuster.sh
>Index: linux-flashplugin7/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/linux-flashplugin7/Makefile,v
>retrieving revision 1.22
>diff -u -r1.22 Makefile
>--- linux-flashplugin7/Makefile	24 Sep 2007 10:48:28 -0000	1.22
>+++ linux-flashplugin7/Makefile	9 Oct 2007 23:40:44 -0000
>@@ -37,10 +37,10 @@
> .include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
> 
> .if defined (WITH_NSPLUG)
>-RUN_DEPENDS+=	nspluginwrapper:$(PORTSDIR)/www/nspluginwrapper
>+RUN_DEPENDS+=	nspluginwrapper:${PORTSDIR}/www/nspluginwrapper
> .endif
> 
> post-patch:
>-	(cd $(WRKDIR)/fp7_archive/r70 && ${TAR} -xzf install_flash_player_7_linux_r70.tar.gz)
>+	(cd ${WRKDIR}/fp7_archive/r70 && ${TAR} -xzf install_flash_player_7_linux_r70.tar.gz)
> 
> .include <bsd.port.post.mk>
>Index: py-albatross/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/py-albatross/Makefile,v
>retrieving revision 1.10
>diff -u -r1.10 Makefile
>--- py-albatross/Makefile	26 Mar 2007 05:32:13 -0000	1.10
>+++ py-albatross/Makefile	9 Oct 2007 23:38:29 -0000
>@@ -22,7 +22,7 @@
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} ${DOCSDIR}/html
> 	@${TAR} -cf - -C ${WRKSRC}/doc . | ${TAR} -xf - -C ${DOCSDIR}
>-	@${TAR} -cf - -C ${WRKDIR}/albatross-html-$(PORTVERSION) . | ${TAR} -xf - -C ${DOCSDIR}/html
>+	@${TAR} -cf - -C ${WRKDIR}/albatross-html-${PORTVERSION} . | ${TAR} -xf - -C ${DOCSDIR}/html
> 	@${TAR} -cf - -C ${WRKSRC}/samples . | ${TAR} -xf - -C ${EXAMPLESDIR}
> .endif
> 
>Index: rt32/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/rt32/Makefile,v
>retrieving revision 1.50
>diff -u -r1.50 Makefile
>--- rt32/Makefile	8 Sep 2007 01:11:47 -0000	1.50
>+++ rt32/Makefile	9 Oct 2007 23:38:07 -0000
>@@ -153,9 +153,9 @@
> .if !defined(INITIAL_INSTALL)
> .if defined(UPGRADE_RT30)
> .for version in 3.1.0 3.1.15 3.1.17
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
> .endfor
> 	@${ECHO} ""
> 	@${ECHO} "Upgrade of RT3 complete."
>@@ -175,8 +175,8 @@
> 	@${ECHO} ""
> .endif
> .else
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
> 	@${SED} s!%%RT_PATH%%!${RT_PATH}!g ${PKGMESSAGE}
> .endif
> 
>Index: rt34/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/rt34/Makefile,v
>retrieving revision 1.55
>diff -u -r1.55 Makefile
>--- rt34/Makefile	8 Sep 2007 01:11:47 -0000	1.55
>+++ rt34/Makefile	9 Oct 2007 23:37:22 -0000
>@@ -179,9 +179,9 @@
> .if !defined(INITIAL_INSTALL)
> .if defined(UPGRADES)
> .for version in ${UPGRADES}
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
> .endfor
> 	@${ECHO} ""
> 	@${ECHO} "Upgrade of RT3 complete."
>@@ -203,8 +203,8 @@
> 	@${ECHO} ""
> .endif
> .else
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
> 	@${SED} s!%%RT_PATH%%!${RT_PATH}!g ${PKGMESSAGE}
> .endif
> 
>Index: rt36/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/rt36/Makefile,v
>retrieving revision 1.62
>diff -u -r1.62 Makefile
>--- rt36/Makefile	8 Sep 2007 01:11:48 -0000	1.62
>+++ rt36/Makefile	9 Oct 2007 23:36:37 -0000
>@@ -190,9 +190,9 @@
> .if !defined(INITIAL_INSTALL)
> .if defined(UPGRADES)
> .for version in ${UPGRADES}
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
> .endfor
> 	@${ECHO} ""
> 	@${ECHO} "Upgrade of RT3 complete."
>@@ -217,8 +217,8 @@
> 	@${ECHO} ""
> .endif
> .else
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
>+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
> 	@${SED} s!%%RT_PATH%%!${RT_PATH}!g ${PKGMESSAGE}
> .endif
> 
>Index: sidplug/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/sidplug/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- sidplug/Makefile	19 May 2007 20:25:31 -0000	1.9
>+++ sidplug/Makefile	9 Oct 2007 23:35:31 -0000
>@@ -18,7 +18,7 @@
> RUN_DEPENDS=	xsidplay:${PORTSDIR}/audio/xsidplay
> 
> USE_X_PREFIX=	yes
>-MAKE_ARGS=	CC="${CC}" OPTIMIZER="${CFLAGS} -I$(X11BASE)/include"
>+MAKE_ARGS=	CC="${CC}" OPTIMIZER="${CFLAGS} -I${X11BASE}/include"
> 
> .include <bsd.port.pre.mk>
> 
>Index: swfdec-plugin/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/swfdec-plugin/Makefile,v
>retrieving revision 1.23
>diff -u -r1.23 Makefile
>--- swfdec-plugin/Makefile	7 Sep 2007 10:29:39 -0000	1.23
>+++ swfdec-plugin/Makefile	9 Oct 2007 23:35:09 -0000
>@@ -18,7 +18,7 @@
> 
> USE_GETOPT_LONG=	yes
> USE_AUTOTOOLS=	libtool:15
>-CONFIGURE_ARGS=	--with-plugin-dir="$(PREFIX)/lib/browser_plugins"
>+CONFIGURE_ARGS=	--with-plugin-dir="${PREFIX}/lib/browser_plugins"
> 
> USE_LDCONFIG=	yes

Actions: View | Diff

Attachments on bug 117051: 81763