--- Portfile.orig	2007-12-25 22:10:56.000000000 -0600
+++ Portfile	2007-12-25 21:59:02.000000000 -0600
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Portfile 31677 2007-12-02 23:13:39Z ryandesign@macports.org $
 
 PortSystem	1.0
 
@@ -95,4 +95,38 @@
 
 		  reinplace "s|-lguile |-lguile16 |g" ${destroot}${prefix}/bin/guile16-config
 		  reinplace "s|${prefix}/bin/guile|${prefix}/bin/guile16|g" ${destroot}${prefix}/bin/guile16-config
-		}
+		  reinplace "s|libguile\.|libguile16\.|g" ${destroot}${prefix}/lib/libguile16.la
+		  reinplace "s|libguile.la|libguile16.la|g" ${destroot}${prefix}/lib/libguilereadline-v-12.la
+
+		  #
+		  # Code to process the header files and modify their contents to point to guile16 files
+		  #
+		  proc process_dir { src_dir } {
+		     foreach src_file [ glob [ file join $src_dir * ] ] {
+		        if { [ file isdirectory $src_file ] } {
+		           process_dir $src_file
+		        } else {
+		           process_file $src_file
+		        }
+		     }
+		  }
+
+		  proc process_file { src_file } {
+		     reinplace "s|\\<guile\\/|\<guile16\\/|g"    $src_file
+		     reinplace "s|libguile\\.h|libguile16\\.h|g" $src_file
+		     reinplace "s|libguile/|libguile16/|g"       $src_file
+		  }
+
+		  proc process_path { src_path } {
+		     if { [ file isdirectory $src_path ] } {
+		        process_dir $src_path
+		     } else {
+		        process_file $src_path
+		     }
+		  }
+
+		  process_path ${destroot}${prefix}/include/guile16/
+		  process_path ${destroot}${prefix}/include/libguile16/
+		  process_path ${destroot}${prefix}/include/libguile16.h
+		  process_path ${destroot}${prefix}/include/guile-readline/readline.h
+	}