diff --git a/graphics/fxtv/patches/patch-Fxtv b/graphics/fxtv/patches/patch-Fxtv index 5cf81a58f0e..f79a33b89e7 100644 --- a/graphics/fxtv/patches/patch-Fxtv +++ b/graphics/fxtv/patches/patch-Fxtv @@ -1,6 +1,6 @@ -$OpenBSD: patch-Fxtv,v 1.3 2004/01/02 19:03:12 espie Exp $ ---- Fxtv.orig 2001-02-12 22:07:05.000000000 +0100 -+++ Fxtv 2004-01-02 19:53:56.000000000 +0100 +$OpenBSD: patch-Fxtv,v 1.4 2004/01/03 14:23:24 espie Exp $ +--- Fxtv.orig Mon Feb 12 17:07:05 2001 ++++ Fxtv Wed Aug 15 13:46:30 2001 @@ -13,7 +13,7 @@ Fxtv*defaultInput: tuner ! tuner, external, internal, auto Fxtv*afc: False @@ -18,14 +18,14 @@ $OpenBSD: patch-Fxtv,v 1.3 2004/01/02 19:03:12 espie Exp $ -Fxtv*recCmdMpeg3: mpeg_musicin -l 3 -p 2 -Fxtv*playCmdMpeg2: mpg123 -Fxtv*playCmdMpeg3: mpg123 -+Fxtv*recCmdMpeg2: /usr/local/bin/mp3encode -l 2 -p 1 -+Fxtv*recCmdMpeg3: /usr/local/bin/mp3encode -l 3 -p 2 -+Fxtv*playCmdMpeg2: /usr/local/bin/mpg321 -+Fxtv*playCmdMpeg3: /usr/local/bin/mpg321 ++Fxtv*recCmdMpeg2: %%LOCALBASE%%/bin/mp3encode -l 2 -p 1 ++Fxtv*recCmdMpeg3: %%LOCALBASE%%/bin/mp3encode -l 3 -p 2 ++Fxtv*playCmdMpeg2: %%LOCALBASE%%/bin/mpg321 ++Fxtv*playCmdMpeg3: %%LOCALBASE%%/bin/mpg321 ! Custom MPEG video/system stream conversion script -!Fxtv*videoCnvtScript: /usr/X11R6/lib/X11/fxtv/fxtv_cnvt.sh -+!Fxtv*videoCnvtScript: /usr/local/share/fxtv/fxtv_cnvt.sh ++!Fxtv*videoCnvtScript: %%LOCALBASE%%/share/fxtv/fxtv_cnvt.sh ! Video-mode specific stuff Fxtv*bswap2Bpp: true diff --git a/graphics/fxtv/patches/patch-app_rsrc_h b/graphics/fxtv/patches/patch-app_rsrc_h index 10accd0f6fb..e86276ee718 100644 --- a/graphics/fxtv/patches/patch-app_rsrc_h +++ b/graphics/fxtv/patches/patch-app_rsrc_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-app_rsrc_h,v 1.3 2004/01/02 19:03:12 espie Exp $ +$OpenBSD: patch-app_rsrc_h,v 1.4 2004/01/03 14:23:24 espie Exp $ --- app_rsrc.h.orig 2001-02-12 22:17:53.000000000 +0100 +++ app_rsrc.h 2004-01-02 19:58:04.000000000 +0100 @@ -399,20 +399,20 @@ static XtResource Resources[] = { @@ -6,24 +6,24 @@ $OpenBSD: patch-app_rsrc_h,v 1.3 2004/01/02 19:03:12 espie Exp $ { RNrecCmdMpeg2, RCrecCmd, XtRString, sizeof(String), XtOffsetOf(AppResources, rec_cmd_mpeg2 ), XtRImmediate, - "mpeg_musicin -l 2 -p 1" }, -+ "/usr/local/bin/mp3encode -l 2 -p 1" }, ++ "%%LOCALBASE%%/bin/mp3encode -l 2 -p 1" }, { RNrecCmdMpeg3, RCrecCmd, XtRString, sizeof(String), XtOffsetOf(AppResources, rec_cmd_mpeg3 ), XtRImmediate, - "mpeg_musicin -l 3 -p 2" }, -+ "/usr/local/bin/mp3encode -l 3 -p 2" }, ++ "%%LOCALBASE%%/bin/mp3encode -l 3 -p 2" }, { RNplayCmdMpeg2, RCplayCmd, XtRString, sizeof(String), XtOffsetOf(AppResources, play_cmd_mpeg2 ), XtRImmediate, - "mpg123" }, -+ "/usr/local/bin/mpg321" }, ++ "%%LOCALBASE%%/bin/mpg321" }, { RNplayCmdMpeg3, RCplayCmd, XtRString, sizeof(String), XtOffsetOf(AppResources, play_cmd_mpeg3 ), XtRImmediate, - "mpg123" }, -+ "/usr/local/bin/mpg321" }, ++ "%%LOCALBASE%%/bin/mpg321" }, { RNvideoCnvtScript, RCvideoCnvtScript, XtRString, sizeof(String), XtOffsetOf(AppResources, video_cnvt_script ), XtRImmediate, - X11BASE "/lib/X11/fxtv/fxtv_cnvt.sh" }, -+ "/usr/local/share/fxtv/fxtv_cnvt.sh" }, ++ "%%LOCALBASE%%/share/fxtv/fxtv_cnvt.sh" }, { RNbswap2Bpp, RCswap, XtRBoolean, sizeof(Boolean), XtOffsetOf(AppResources, bswap2Bpp), XtRImmediate, diff --git a/graphics/fxtv/patches/patch-fxtv_cnvt_sh b/graphics/fxtv/patches/patch-fxtv_cnvt_sh index db2aa4a342a..c8d1d078644 100644 --- a/graphics/fxtv/patches/patch-fxtv_cnvt_sh +++ b/graphics/fxtv/patches/patch-fxtv_cnvt_sh @@ -1,21 +1,21 @@ -$OpenBSD: patch-fxtv_cnvt_sh,v 1.2 2004/01/02 19:03:12 espie Exp $ ---- fxtv_cnvt.sh.orig 2001-02-12 22:18:40.000000000 +0100 -+++ fxtv_cnvt.sh 2004-01-02 19:53:56.000000000 +0100 +$OpenBSD: patch-fxtv_cnvt_sh,v 1.3 2004/01/03 14:23:24 espie Exp $ +--- fxtv_cnvt.sh.orig Mon Feb 12 17:18:40 2001 ++++ fxtv_cnvt.sh Wed Aug 15 13:47:57 2001 @@ -40,12 +40,12 @@ # Default to $PATH if [ -z "$PATH_FXTV" ]; then - PATH_FXTV="fxtv" -+ PATH_FXTV="/usr/local/bin/fxtv" ++ PATH_FXTV="%%LOCALBASE%%/bin/fxtv" fi -PATH_SOX="sox" -PATH_MPEG_MUSICIN="mpeg_musicin" -PATH_MPEG_ENCODE="mpeg_encode" -PATH_MPLEX="mplex" -+PATH_SOX="/usr/local/bin/sox" -+PATH_MPEG_MUSICIN="/usr/local/bin/mp3encode" -+PATH_MPEG_ENCODE="/usr/local/bin/mpeg_encode" -+PATH_MPLEX="/usr/local/bin/mplex" ++PATH_SOX="%%LOCALBASE%%/bin/sox" ++PATH_MPEG_MUSICIN="%%LOCALBASE%%/bin/mp3encode" ++PATH_MPEG_ENCODE="%%LOCALBASE%%/bin/mpeg_encode" ++PATH_MPLEX="%%LOCALBASE%%/bin/mplex" #--------------------- MPEG_ENCODE PARAMETER FILE TEMPLATES ------------------ @@ -54,7 +54,7 @@ $OpenBSD: patch-fxtv_cnvt_sh,v 1.2 2004/01/02 19:03:12 espie Exp $ MPEG_ENC_PARAM_STR_TIFF=\ 'BASE_FILE_FORMAT PPM -INPUT_CONVERT tifftopnm *' -+INPUT_CONVERT /usr/local/bin/tifftopnm *' ++INPUT_CONVERT %%LOCALBASE%%/bin/tifftopnm *' MPEG_ENC_PARAM_STR_PPM=\ -'BASE_FILE_FORMAT PPM