diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index f600b626b6c..ff78bfe5508 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/09/23 06:33:56 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.4 2001/10/08 04:57:25 pvalchev Exp $
 
 COMMENT=	"high-quality mpeg audio decoder"
 
@@ -41,4 +41,8 @@ CONFIGURE_ARGS+= --enable-sso \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+PATCH_LIST=	${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
+		${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
+		patch-*
+
 .include <bsd.port.mk>
diff --git a/audio/mad/patches/patch-ltconfig b/audio/mad/patches/patch-ltconfig
deleted file mode 100644
index 44330f9d902..00000000000
--- a/audio/mad/patches/patch-ltconfig
+++ /dev/null
@@ -1,57 +0,0 @@
-$OpenBSD: patch-ltconfig,v 1.2 2001/08/07 06:36:38 pvalchev Exp $
---- ltconfig.orig	Thu Oct 12 16:44:11 2000
-+++ ltconfig	Mon Aug  6 23:34:56 2001
-@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
-     with_gnu_ld=no
-   fi
-   ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
- 
- esac
- 
-@@ -1402,10 +1405,21 @@ else
-     ;;
- 
-   openbsd*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
--    hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-+    case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+      *)
-+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  export_dynamic_flag_spec='${wl}-E'
-+	fi
-+      ;;
-+    esac
-     ;;
- 
-   os2*)
-@@ -2021,9 +2035,16 @@ netbsd*)
- 
- openbsd*)
-   version_type=sunos
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--    need_version=no
-+  need_lib_prefix=no
-+  need_version=no
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    shlibpath_overrides_runpath=no
-+  else
-+    deplibs_check_method='file_magic OpenBSD.* shared library'
-+    shlibpath_overrides_runpath=yes
-   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
diff --git a/audio/mad/patches/patch-ltmain_sh b/audio/mad/patches/patch-ltmain_sh
deleted file mode 100644
index 8265042f125..00000000000
--- a/audio/mad/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,83 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2001/08/07 06:36:38 pvalchev Exp $
---- ltmain.sh.orig	Thu Oct 12 16:44:11 2000
-+++ ltmain.sh	Mon Aug  6 23:34:59 2001
-@@ -1079,6 +1079,17 @@ compiler."
- 	    # These systems don't actually have c library (as such)
- 	    continue
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    continue
-+	    ;;
-+	  esac
-+	elif test "$arg" = "-lc_r"; then
-+	  case "$host" in
-+	  *-*-openbsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
- 	  esac
- 	elif test "$arg" = "-lm"; then
- 	  case "$host" in
-@@ -1091,6 +1102,10 @@ compiler."
- 	deplibs="$deplibs $arg"
- 	;;
- 
-+      -?thread)
-+	deplibs="$deplibs $arg"
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1795,6 +1810,9 @@ compiler."
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
- 	  ;;
-+	*-*-openbsd*)
-+	  # Do not include libc due to us having libc/libc_r.
-+	  ;;
-         *-*-rhapsody*)
- 	  # rhapsody is a little odd...
- 	  deplibs="$deplibs -framework System"
-@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
-     # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      echo "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
--    echo "See any operating system documentation about shared libraries for"
--    echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
-