Attachment #53628 for bug #81125

View | Details | Raw Unified | Return to bug 81125
Collapse All | Expand All




#

PORTNAME=	kmenc15
PORTVERSION=	0.04
PORTREVISION=	1
CATEGORIES=	multimedia kde
MASTER_SITES=	http://dividedsky.net/~ods15/kmenc15/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	KDE advanced MEncoder frontend, ala, VirtualDub

RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer
		sox:${PORTSDIR}/audio/sox \
		yuvtoppm:${PORTSDIR}/graphics/netpbm

USE_BZIP2=	yes
USE_KDELIBS_VER=	3
USE_GMAKE=	yes
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:
	@${REINPLACE_CMD} -e 's|--no-backup-if-mismatch||g' ${WRKSRC}/Makefile
	@${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}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)multimedia/kmenc15/distinfo (-2 / +2 lines)
1	MD5 (kmenc15-0.02.tar.bz2) = eca10e4af80ff011f8c8b1c7fb783f19	1	MD5 (kmenc15-0.04.tar.bz2) = 64e46a32cd055516b9d82f60836eefcb
2	SIZE (kmenc15-0.02.tar.bz2) = 173624	2	SIZE (kmenc15-0.04.tar.bz2) = 177358




--- 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

Return to bug 81125

Lines 6-47 Link Here

(-)multimedia/kmenc15/Makefile (-22 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= kmenc15	8	PORTNAME= kmenc15
9	PORTVERSION= 0.02	9	PORTVERSION= 0.04
10	PORTREVISION= 1
11	CATEGORIES= multimedia kde	10	CATEGORIES= multimedia kde
12	MASTER_SITES= http://dividedsky.net/~ods15/kmenc15/	11	MASTER_SITES= http://dividedsky.net/~ods15/kmenc15/
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= KDE advanced MEncoder frontend, ala, VirtualDub	14	COMMENT= KDE advanced MEncoder frontend, ala, VirtualDub
16		15
17	BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer \	16	RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer
18	sox:${PORTSDIR}/audio/sox \
19	yuvtoppm:${PORTSDIR}/graphics/netpbm
20		17
21	USE_BZIP2= yes	18	USE_BZIP2= yes
22	USE_KDELIBS_VER=3	19	USE_KDELIBS_VER= 3
23	USE_GMAKE= yes
24	USE_REINPLACE= yes	20	USE_REINPLACE= yes
		21	USE_GMAKE= yes
		22	MAKE_ARGS= QTDIR="${QT_PREFIX}" \
		23	KDEDIR="${KDE_PREFIX}" \
		24	CPP="${CXX}" \
		25	CFLAGS="${PTHREAD_LIBS}" \
		26	CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
		27	VERSION="${PORTVERSION}"
25		28
26	PLIST_FILES= bin/${PORTNAME}	29	PLIST_FILES= bin/${PORTNAME}
27		30
28	post-patch:	31	post-patch:
29	# FreeBSD uses sed(1) -E -e instead of sed(1) -r	32	@${REINPLACE_CMD} -e 's\|--no-backup-if-mismatch\|\|g' ${WRKSRC}/Makefile
30	@${REINPLACE_CMD} -E \
31	-e 's\|sed -r\|${SED} -E -e\|' \
32	${BUILD_WRKSRC}/${MAKEFILE} \
33	${WRKSRC}/dialog.cpp
34
35	do-configure:
36	# CXX{,FLAGS} safeness
37	# PTHREAD_{CFLAGS,LIBS} safeness
38	@${REINPLACE_CMD} -E \
39	-e 's\|^(CPP[[:space:]]=).$$\|\1${CXX}\|' \
40	-e 's\|^(CFLAGS[[:space:]]=).$$\|\1${CXXFLAGS} ${PTHREAD_CFLAGS}\|' \
41	-e 's\|^(BFLAGS.*)$$\|\1 ${PTHREAD_LIBS}\|' \
42	${BUILD_WRKSRC}/${MAKEFILE}
43		33
44	do-install:	34	do-install:
45	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	35	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
46		36
47	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)multimedia/kmenc15/files/patch-Makefile (-24 lines)
1	--- Makefile.orig Sun Oct 24 09:18:38 2004
2	+++ Makefile Wed Dec 15 16:45:54 2004
3	@@ -54,7 +54,6 @@
4
5
6	PROG = ${PRGNAME}-$(shell grep 'char version' main.cpp -m 1 \| sed -r 's/^."(.)".*$$/\1/')
7	-DRFLAGS= $(shell test -f DEBUGMODE && echo ${DFLAGS} \|\| echo ${RFLAGS} )
8
9	GZFILE = ${PROG}.tar.gz
10	BZFILE = ${PROG}.tar.bz2
11	@@ -104,11 +103,11 @@
12	else
13	images.cpp: images.diff ${DATA} ${IMAGES}
14	${QEMBED} ${DATA} --images ${IMAGES} > $@
15	- $(if $(wildcard $<),patch -s --no-backup-if-mismatch < $<)
16	+ $(if $(wildcard $<),patch -s < $<)
17	endif
18	%.cpp: %.diff %.ui %.h %.moc
19	${UIC} ${UFLAGS} -impl $.h -o $@ $.ui
20	- $(if $(wildcard $<),patch -s --no-backup-if-mismatch < $<)
21	+ $(if $(wildcard $<),patch -s < $<)
22	%.moc: %.h ; ${MOC} -o $@ $<
23	%.h: %.ui ; ${UIC} -o $@ $<
24	%.diff: ; @true