Attachment #27488 for bug #46610

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

Lines 6-18 Link Here

(-)/usr/ports/graphics/xawtv/Makefile (-8 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= xawtv	8	PORTNAME= xawtv
9	PORTVERSION= 3.79	9	PORTVERSION= 3.82
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://bytesex.org/xawtv/	11	MASTER_SITES= http://bytesex.org/xawtv/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	12	DISTNAME= ${PORTNAME}_${PORTVERSION}
13		13
14	MAINTAINER= lehmann@ans-netz.de	14	MAINTAINER= lehmann@ans-netz.de
15		15
		16	BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
16	LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \	17	LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
17	png.5:${PORTSDIR}/graphics/png \	18	png.5:${PORTSDIR}/graphics/png \
18	jpeg.9:${PORTSDIR}/graphics/jpeg \	19	jpeg.9:${PORTSDIR}/graphics/jpeg \
Lines 26-31 Link Here
26	USE_X_PREFIX= yes	27	USE_X_PREFIX= yes
27	USE_REINPLACE= yes	28	USE_REINPLACE= yes
28		29
		30	MAKE_ENV= verbose=yes
		31
29	FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk	32	FILES_LIBJPEG= console/Subdir.mk debug/Subdir.mk x11/Subdir.mk
30		33
31	MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \	34	MAN1= alevtd.1 dump-mixers.1 fbtv.1 mtt.1 motv.1 ntsc-cc.1 pia.1 \
Lines 37-55 Link Here
37		40
38	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
39		42
40	.if ${XFREE86_VERSION} == 4
41	BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
42	RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
43	.endif
44
45	PLIST_SUB+= X11PREFIX=${X11BASE}	43	PLIST_SUB+= X11PREFIX=${X11BASE}
46		44
47	post-patch:	45	post-patch:
48	${REINPLACE_CMD} -e "s\|/usr/X11R6\|${X11BASE}\|g" \	46	@${REINPLACE_CMD} -e "s\|/usr/X11R6\|${X11BASE}\|g" \
49	-e "s\|/usr/local\|${LOCALBASE}\|g" ${WRKSRC}/configure	47	-e "s\|/usr/local\|${LOCALBASE}\|g" ${WRKSRC}/configure
50		48
51	.for i in ${FILES_LIBJPEG}	49	.for i in ${FILES_LIBJPEG}
52	${REINPLACE_CMD} -e "s\|-ljpeg\|-L${LOCALBASE}/lib -ljpeg\|g" ${WRKSRC}/$i	50	@${REINPLACE_CMD} -e "s\|-ljpeg\|-L${LOCALBASE}/lib -ljpeg\|g" ${WRKSRC}/$i
53	.endfor	51	.endfor
54		52
55	.include <bsd.port.post.mk>	53	.include <bsd.port.post.mk>

Line 1 Link Here

(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
1	MD5 (xawtv_3.79.tar.gz) = 351caf310fd7b9328c2c422304f56d6d	1	MD5 (xawtv_3.82.tar.gz) = 803153b6dcce0d786a4772cd8343974a




 # libraries
 LDLIBS  := @LDLIBS@
 
@@ -131,7 +120,7 @@
 ar_lib		= rm -f $@ && ar -r $@ $^ && ranlib $@
 
 # non-verbose output
-VERBOSE		= no
+VERBOSE		= yes
 ifeq ($(VERBOSE),yes)
 echo_compile_c	= echo $(compile_c)
 echo_compile_cc	= echo $(compile_cc)

Lines 59-64 Link Here

(-)/usr/ports/graphics/xawtv/pkg-plist (+2 lines)
59	share/xawtv/ntsc-cable-jp.list	59	share/xawtv/ntsc-cable-jp.list
60	share/xawtv/ntsc-cable.list	60	share/xawtv/ntsc-cable.list
61	share/xawtv/ntsc-hrc.list	61	share/xawtv/ntsc-hrc.list
		62	share/xawtv/oirt-h.list
62	share/xawtv/oirt-i-iii.list	63	share/xawtv/oirt-i-iii.list
63	share/xawtv/oirt-sl-sh.list	64	share/xawtv/oirt-sl-sh.list
64	share/xawtv/pal-australia-optus.list	65	share/xawtv/pal-australia-optus.list
Lines 69-74 Link Here
69	share/xawtv/pal-italy.list	70	share/xawtv/pal-italy.list
70	share/xawtv/pal-newzealand.list	71	share/xawtv/pal-newzealand.list
71	share/xawtv/secam-france.list	72	share/xawtv/secam-france.list
		73	share/xawtv/secam-russia.list
72	share/xawtv/uhf.list	74	share/xawtv/uhf.list
73	@dirrm share/xawtv	75	@dirrm share/xawtv
74	@cwd %%X11BASE%%	76	@cwd %%X11BASE%%

Return to bug 46610

Lines 22-33 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-Makefile.in (-9 lines)
22	# libraries	22	# libraries
23	LDLIBS := @LDLIBS@	23	LDLIBS := @LDLIBS@
24		24
25	@@ -131,7 +120,7 @@
26	ar_lib = rm -f $@ && ar -r $@ $^ && ranlib $@
27
28	# non-verbose output
29	-VERBOSE = no
30	+VERBOSE = yes
31	ifeq ($(VERBOSE),yes)
32	echo_compile_c = echo $(compile_c)
33	echo_compile_cc = echo $(compile_cc)