Attachment 53628 Details for Bug 81125 – file.diff

[patch] file.diff

file.diff (text/plain), 3.11 KB, created by tkato432 on 2005-05-16 19:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-05-16 19:10:07 UTC

Size: 3.11 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/kmenc15/Makefile multimedia/kmenc15/Makefile
>--- /usr/ports/multimedia/kmenc15/Makefile	Sat Mar 12 20:27:46 2005
>+++ multimedia/kmenc15/Makefile	Tue May 17 01:22:52 2005
>@@ -6,42 +6,32 @@
> #
> 
> PORTNAME=	kmenc15
>-PORTVERSION=	0.02
>-PORTREVISION=	1
>+PORTVERSION=	0.04
> CATEGORIES=	multimedia kde
> MASTER_SITES=	http://dividedsky.net/~ods15/kmenc15/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	KDE advanced MEncoder frontend, ala, VirtualDub
> 
>-BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer \
>-		sox:${PORTSDIR}/audio/sox \
>-		yuvtoppm:${PORTSDIR}/graphics/netpbm
>+RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer
> 
> USE_BZIP2=	yes
>-USE_KDELIBS_VER=3
>-USE_GMAKE=	yes
>+USE_KDELIBS_VER=	3
> USE_REINPLACE=	yes
>+USE_GMAKE=	yes
>+MAKE_ARGS=	QTDIR="${QT_PREFIX}" \
>+		KDEDIR="${KDE_PREFIX}" \
>+		CPP="${CXX}" \
>+		CFLAGS="${PTHREAD_LIBS}" \
>+		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
>+		VERSION="${PORTVERSION}"
> 
> PLIST_FILES=	bin/${PORTNAME}
> 
> post-patch:
>-# FreeBSD uses sed(1) -E -e instead of sed(1) -r
>-	@${REINPLACE_CMD} -E \
>-		-e 's|sed -r|${SED} -E -e|' \
>-		${BUILD_WRKSRC}/${MAKEFILE} \
>-		${WRKSRC}/dialog.cpp
>-
>-do-configure:
>-# CXX{,FLAGS} safeness
>-# PTHREAD_{CFLAGS,LIBS} safeness
>-	@${REINPLACE_CMD} -E \
>-		-e 's|^(CPP[[:space:]]*=).*$$|\1${CXX}|' \
>-		-e 's|^(CFLAGS[[:space:]]*=).*$$|\1${CXXFLAGS} ${PTHREAD_CFLAGS}|' \
>-		-e 's|^(BFLAGS.*)$$|\1 ${PTHREAD_LIBS}|' \
>-		${BUILD_WRKSRC}/${MAKEFILE}
>+	@${REINPLACE_CMD} -e 's|--no-backup-if-mismatch||g' ${WRKSRC}/Makefile
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/multimedia/kmenc15/distinfo multimedia/kmenc15/distinfo
>--- /usr/ports/multimedia/kmenc15/distinfo	Thu Dec 16 03:48:15 2004
>+++ multimedia/kmenc15/distinfo	Tue May 17 00:43:54 2005
>@@ -1,2 +1,2 @@
>-MD5 (kmenc15-0.02.tar.bz2) = eca10e4af80ff011f8c8b1c7fb783f19
>-SIZE (kmenc15-0.02.tar.bz2) = 173624
>+MD5 (kmenc15-0.04.tar.bz2) = 64e46a32cd055516b9d82f60836eefcb
>+SIZE (kmenc15-0.04.tar.bz2) = 177358
>diff -urN /usr/ports/multimedia/kmenc15/files/patch-Makefile multimedia/kmenc15/files/patch-Makefile
>--- /usr/ports/multimedia/kmenc15/files/patch-Makefile	Thu Dec 16 03:48:15 2004
>+++ multimedia/kmenc15/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>@@ -1,24 +0,0 @@
>---- Makefile.orig	Sun Oct 24 09:18:38 2004
>-+++ Makefile	Wed Dec 15 16:45:54 2004
>-@@ -54,7 +54,6 @@
>- 
>- 
>- PROG   = ${PRGNAME}-$(shell grep 'char version' main.cpp -m 1 | sed -r 's/^.*"(.*)".*$$/\1/')
>--DRFLAGS= $(shell test -f DEBUGMODE && echo ${DFLAGS} || echo ${RFLAGS} )
>- 
>- GZFILE = ${PROG}.tar.gz
>- BZFILE = ${PROG}.tar.bz2
>-@@ -104,11 +103,11 @@
>- else
>- images.cpp: images.diff ${DATA} ${IMAGES}
>- 	${QEMBED} ${DATA} --images ${IMAGES} > $@
>--	$(if $(wildcard $<),patch -s --no-backup-if-mismatch < $<)
>-+	$(if $(wildcard $<),patch -s < $<)
>- endif
>- %.cpp: %.diff %.ui %.h %.moc
>- 	${UIC} ${UFLAGS} -impl $*.h -o $@ $*.ui
>--	$(if $(wildcard $<),patch -s --no-backup-if-mismatch < $<)
>-+	$(if $(wildcard $<),patch -s < $<)
>- %.moc: %.h ; ${MOC} -o $@ $<
>- %.h: %.ui ; ${UIC} -o $@ $<
>- %.diff: ; @true

Actions: View | Diff

Attachments on bug 81125: 53628