Attachment #20099 for bug #35510

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

Lines 27-32 Link Here

(-)/usr/ports/graphics/xawtv/Makefile (+4 lines)
27	FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \	27	FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \
28	libng libvbi http	28	libng libvbi http
29	FILES_X11BASE= configure Make.config.in	29	FILES_X11BASE= configure Make.config.in
		30	FILES_LOCALBASE=configure
30		31
31	MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \	32	MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
32	rootv.1 scantv.1 showriff.1 \	33	rootv.1 scantv.1 showriff.1 \
Lines 40-45 Link Here
40	post-patch:	41	post-patch:
41	.for i in ${FILES_X11BASE}	42	.for i in ${FILES_X11BASE}
42	${PERL} -pi -e "s\|%%X11BASE%%\|${X11BASE}\|g" ${WRKSRC}/$i	43	${PERL} -pi -e "s\|%%X11BASE%%\|${X11BASE}\|g" ${WRKSRC}/$i
		44	.endfor
		45	.for i in ${FILES_LOCALBASE}
		46	${PERL} -pi -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" ${WRKSRC}/$i
43	.endfor	47	.endfor
44		48
45	post-configure:	49	post-configure:




--- configure.orig	Mon Jan 14 20:33:50 2002
+++ configure	Mon Jan 14 20:35:51 2002
@@ -1024,7 +1024,7 @@
 	OpenBSD | FreeBSD | NetBSD)
 		# *BSD has important stuff (from ports) in
 		# /usr/local ...
-		CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
+		CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L/%%LOCALBASE%%/lib"
 		PLUGINS="drv0-bsd.so snd-oss.so"
 		VBIFLAGS="-DBSD"
 		;;
@@ -1529,10 +1529,10 @@
     /usr/XFree86/include/X11  \
                               \
     /usr/include              \
-    /usr/local/include        \
+    %%LOCALBASE%%/include        \
     /usr/unsupported/include  \
     /usr/athena/include       \
-    /usr/local/x11r5/include  \
+    %%LOCALBASE%%/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
     /usr/openwin/include      \
@@ -1604,10 +1604,10 @@
     /usr/XFree86/lib/X11  \
                           \
     /usr/lib              \
-    /usr/local/lib        \
+    %%LOCALBASE%%/lib        \
     /usr/unsupported/lib  \
     /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
+    %%LOCALBASE%%/x11r5/lib  \
     /usr/lpp/Xamples/lib  \
     /lib/usr/lib/X11	  \
                           \
@@ -2914,19 +2914,13 @@
 
 echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6

-fi
+resdir=%%X11BASE%%/lib/X11
 echo "$ac_t""$resdir/app-defaults" 1>&6


Return to bug 35510

Lines 1-5 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-configure (-1 / +35 lines)
1	--- configure.orig Mon Jan 14 20:33:50 2002	1	--- configure.orig Mon Jan 14 20:33:50 2002
2	+++ configure Mon Jan 14 20:35:51 2002	2	+++ configure Mon Jan 14 20:35:51 2002
		3	@@ -1024,7 +1024,7 @@
		4	OpenBSD \| FreeBSD \| NetBSD)
		5	# *BSD has important stuff (from ports) in
		6	# /usr/local ...
		7	- CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
		8	+ CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L/%%LOCALBASE%%/lib"
		9	PLUGINS="drv0-bsd.so snd-oss.so"
		10	VBIFLAGS="-DBSD"
		11	;;
		12	@@ -1529,10 +1529,10 @@
		13	/usr/XFree86/include/X11 \
		14	\
		15	/usr/include \
		16	- /usr/local/include \
		17	+ %%LOCALBASE%%/include \
		18	/usr/unsupported/include \
		19	/usr/athena/include \
		20	- /usr/local/x11r5/include \
		21	+ %%LOCALBASE%%/x11r5/include \
		22	/usr/lpp/Xamples/include \
		23	\
		24	/usr/openwin/include \
		25	@@ -1604,10 +1604,10 @@
		26	/usr/XFree86/lib/X11 \
		27	\
		28	/usr/lib \
		29	- /usr/local/lib \
		30	+ %%LOCALBASE%%/lib \
		31	/usr/unsupported/lib \
		32	/usr/athena/lib \
		33	- /usr/local/x11r5/lib \
		34	+ %%LOCALBASE%%/x11r5/lib \
		35	/usr/lpp/Xamples/lib \
		36	/lib/usr/lib/X11 \
		37	\
3	@@ -2914,19 +2914,13 @@	38	@@ -2914,19 +2914,13 @@
4		39
5	echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6	40	echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6
Lines 20-24 Link Here
20	-fi	55	-fi
21	+resdir=%%X11BASE%%/lib/X11	56	+resdir=%%X11BASE%%/lib/X11
22	echo "$ac_t""$resdir/app-defaults" 1>&6	57	echo "$ac_t""$resdir/app-defaults" 1>&6
23