mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

LOCALBASE safeness for configure script checking for libraries.

Browse Source 
PR:		35510
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2002-03-04 00:19:42 +00:00
parent bdee13b9cc
commit e9fc981daa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=55493
4 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/xawtv/Makefile
View File

@ -27,6 +27,7 @@ USE_X_PREFIX= yes
FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \
libng libvbi http
FILES_X11BASE= configure Make.config.in
FILES_LOCALBASE=configure
MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
rootv.1 scantv.1 showriff.1 \
@ -41,6 +42,9 @@ post-patch:
.for i in ${FILES_X11BASE}
${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i
.endfor
.for i in ${FILES_LOCALBASE}
${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i
.endfor
post-configure:
.for i in ${FILES_CFLAGS}

36
graphics/xawtv/files/patch-configure
View File

@ -1,5 +1,40 @@
--- 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
@ -21,4 +56,3 @@
+resdir=%%X11BASE%%/lib/X11
echo "$ac_t""$resdir/app-defaults" 1>&6

4
multimedia/xawtv/Makefile
View File

@ -27,6 +27,7 @@ USE_X_PREFIX= yes
FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \
libng libvbi http
FILES_X11BASE= configure Make.config.in
FILES_LOCALBASE=configure
MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \
rootv.1 scantv.1 showriff.1 \
@ -41,6 +42,9 @@ post-patch:
.for i in ${FILES_X11BASE}
${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i
.endfor
.for i in ${FILES_LOCALBASE}
${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/$i
.endfor
post-configure:
.for i in ${FILES_CFLAGS}

36
multimedia/xawtv/files/patch-configure
View File

@ -1,5 +1,40 @@
--- 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
@ -21,4 +56,3 @@
+resdir=%%X11BASE%%/lib/X11
echo "$ac_t""$resdir/app-defaults" 1>&6