Attachment 112070 Details for Bug 153429 – patch.txt

patch.txt

patch.txt (text/plain; charset=us-ascii), 4.61 KB, created by Alex Kozlov on 2011-11-04 13:47:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kozlov

Created: 2011-11-04 13:47:41 UTC

Size: 4.61 KB

patch

obsolete

>Index: audio/linux-mbrola/Makefile
>@@ -21,7 +21,7 @@
> 
> CONFLICTS=	mbrola-*
> NO_BUILD=	yes
>-ONLY_FOR_ARCHS=	alpha amd64 i386
>+ONLY_FOR_ARCHS=	amd64 i386
> USE_LINUX=	yes
> USE_ZIP=	yes
> RESTRICTED=	for non-commercial, non-military applications only
>@@ -36,7 +36,8 @@
> 
> do-extract:
> 	@${MKDIR} ${WRKSRC}
>-	@unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.zip -d ${WRKSRC}
>+	@${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} \
>+		${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.zip -d ${WRKSRC}
> 
> do-patch:
> 	@${RM} -f ${WRKSRC}/mbrola-FreeBSD-i386-aout
>@@ -44,11 +45,7 @@
> .include <bsd.port.pre.mk>
> 
> do-install:
>-.if (${ARCH} == "alpha")
>-	@${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-alpha ${PREFIX}/bin/mbrola
>-.else
> 	@${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-i386 ${PREFIX}/bin/mbrola
>-.endif
> 	@${CHMOD} +x ${PREFIX}/bin/mbrola
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>Index: editors/openoffice.org-3-RC/Makefile
>@@ -189,7 +189,7 @@
> pre-configure:
> #Workaround for gperf. #i85469#
> 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
>-	@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
>+	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
> .if defined(WITH_KDE4)
> 	@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
> .endif
>Index: editors/openoffice.org-3-devel/Makefile
>@@ -196,7 +196,7 @@
> pre-configure:
> #Workaround for gperf. #i85469#
> 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
>-	@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
>+	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
> .if defined(WITH_KDE4)
> 	@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
> .endif
>Index: editors/openoffice.org-3/Makefile
>@@ -185,7 +185,7 @@
> pre-configure:
> #Workaround for gperf. #i85469#
> 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
>-	@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
>+	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
> .if defined(WITH_KDE4)
> 	@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
> .endif
>Index: editors/openoffice.org-vcltesttool/Makefile
>@@ -120,7 +120,7 @@
> pre-configure:
> #Workaround for gperf. #i85469#
> 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
>-	@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
>+	@${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
> 
> do-build:
> 	@cd ${WRKSRC} ; ./bootstrap
>Index: mail/mailscanner/Makefile
>@@ -146,7 +146,7 @@
> 		-e 's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g'	\
> 		-e 's,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g' \
> 		-e 's,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g'	\
>-		-e 's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g'		\
>+		-e 's,/usr/bin/unzip,${UNZIP_CMD},g'		\
> 		-e 's,/usr/bin/wget,${LOCALBASE}/bin/wget,g'		\
> 		-e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g'		\
> 		${WRKSRC}/bin/MailScanner				\
>Index: multimedia/sms1xxx-kmod/Makefile
>@@ -77,7 +77,7 @@
> 	and copy the file to '${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw'\n\
> 	e.g. :\n\
> 	wget 'ftp://ftp.terratec.net/Receiver/Cinergy_Piranha/Update/Cinergy_Piranha_Drv_Vista_XP_3.09.02.00.exe'\n\
>-	unzip -j 'Cinergy_Piranha_Drv_Vista_XP_3.09.02.00.exe' \\\\\n\
>+	${UNZIP_CMD} -j 'Cinergy_Piranha_Drv_Vista_XP_3.09.02.00.exe' \\\\\n\
> 	\t'Cinergy Piranha/BDA Driver 3.09.02.00/Windos XP (32Bit)/SMS100x_Dvbt.inp'\n\
> 	mv 'SMS100x_Dvbt.inp' '${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw'\n
> .endif
>@@ -98,7 +98,7 @@
> 	and copy the file to '${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw'\n\
> 	e.g. :\n\
> 	wget 'http://www.wintvcd.co.uk/drivers/WinTV-MiniStick_4_2_26_28027_WHQL.zip'\n\
>-	unzip -j 'WinTV-MiniStick_4_2_26_28027_WHQL.zip' \\\\\n\
>+	${UNZIP_CMD} -j 'WinTV-MiniStick_4_2_26_28027_WHQL.zip' \\\\\n\
> 	\t'driver17/hcw17dvb.1b0'\n\
> 	mv 'hcw17dvb.1b0' '${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw'\n
> .endif
>Index: print/acrobatviewer/Makefile
>@@ -43,7 +43,7 @@
> 		@${MKDIR} ${WRKSRC} && \
> 			cd ${WRKSRC} && \
> 			dd if=${DISTDIR}/viewer.bin of=archive.zip bs=${BLOCKSIZE} skip=${ARCHSTART} count=${ARCHBLOCKS} 2>/dev/null && \
>-			${LOCALBASE}/bin/unzip -o -a -j -qq archive.zip
>+			${UNZIP_CMD} -o -a -j -qq archive.zip
> 		@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
> 			${DISTDIR}/MRJToolkitStubs.zip ${EXTRACT_AFTER_ARGS}
> 
>Index: java/sun-wtk/Makefile
>@@ -41,7 +41,7 @@
> 	@cd ${WRKDIR} \
> 	&& dd bs=1024 if=${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
> 		of=${WRKDIR}/j2mewtk-solaris.zip skip=20 2>/dev/null
>-	@${LOCALBASE}/bin/unzip -qo ${WRKDIR}/j2mewtk-solaris.zip -d ${WRKSRC}
>+	@${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/j2mewtk-solaris.zip -d ${WRKSRC}
> 	@${FIND} ${WRKSRC} -type f -exec ${CHMOD} 0644 {} \+
> 	@${FIND} ${WRKSRC} -type d -exec ${CHMOD} 0755 {} \+
> 	@${FIND} ${WRKSRC}/bin ! -name '*.jar' -exec ${CHMOD} 0755 {} \;

Actions: View

Attachments on bug 153429: 112067 | 112068 | 112069 | 112070