diff options
| -rw-r--r-- | graphics/xawtv/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xawtv/files/patch-configure | 36 | ||||
| -rw-r--r-- | multimedia/xawtv/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/xawtv/files/patch-configure | 36 |
4 files changed, 78 insertions, 2 deletions
diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile index e8d3ebc4bdec..2e3371862bab 100644 --- a/graphics/xawtv/Makefile +++ b/graphics/xawtv/Makefile @@ -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} diff --git a/graphics/xawtv/files/patch-configure b/graphics/xawtv/files/patch-configure index 6029fe46a9f5..a017bedf56ae 100644 --- a/graphics/xawtv/files/patch-configure +++ b/graphics/xawtv/files/patch-configure @@ -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 - diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index e8d3ebc4bdec..2e3371862bab 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -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} diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure index 6029fe46a9f5..a017bedf56ae 100644 --- a/multimedia/xawtv/files/patch-configure +++ b/multimedia/xawtv/files/patch-configure @@ -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 - |