14 files changed, 121 insertions, 26 deletions
diff --git a/Library/ENV/pkgconfig/10.10/sqlite3.pc b/Library/ENV/pkgconfig/10.10/sqlite3.pc
new file mode 100644
index 000000000..a80a074ed
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.10/sqlite3.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SQLite
+Description: SQL database engine
+Version: 3.8.5
+Libs: -L${libdir} -lsqlite3
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.10/zlib.pc b/Library/ENV/pkgconfig/10.10/zlib.pc
new file mode 100644
index 000000000..c7bef6a9f
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.10/zlib.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.5
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.6/sqlite3.pc b/Library/ENV/pkgconfig/10.6/sqlite3.pc
new file mode 100644
index 000000000..8e0269ed6
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.6/sqlite3.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SQLite
+Description: SQL database engine
+Version: 3.6.12
+Libs: -L${libdir} -lsqlite3
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.6/zlib.pc b/Library/ENV/pkgconfig/10.6/zlib.pc
new file mode 100644
index 000000000..47b08b1ea
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.6/zlib.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.3
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.7/sqlite3.pc b/Library/ENV/pkgconfig/10.7/sqlite3.pc
new file mode 100644
index 000000000..36daed3d3
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.7/sqlite3.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SQLite
+Description: SQL database engine
+Version: 3.7.7
+Libs: -L${libdir} -lsqlite3
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.7/zlib.pc b/Library/ENV/pkgconfig/10.7/zlib.pc
new file mode 100644
index 000000000..c7bef6a9f
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.7/zlib.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.5
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.8/sqlite3.pc b/Library/ENV/pkgconfig/10.8/sqlite3.pc
new file mode 100644
index 000000000..28a75568c
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.8/sqlite3.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SQLite
+Description: SQL database engine
+Version: 3.7.12
+Libs: -L${libdir} -lsqlite3
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.8/zlib.pc b/Library/ENV/pkgconfig/10.8/zlib.pc
new file mode 100644
index 000000000..c7bef6a9f
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.8/zlib.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.5
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.9/sqlite3.pc b/Library/ENV/pkgconfig/10.9/sqlite3.pc
new file mode 100644
index 000000000..08588adc7
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.9/sqlite3.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SQLite
+Description: SQL database engine
+Version: 3.7.13
+Libs: -L${libdir} -lsqlite3
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/Library/ENV/pkgconfig/10.9/zlib.pc b/Library/ENV/pkgconfig/10.9/zlib.pc
new file mode 100644
index 000000000..c7bef6a9f
--- /dev/null
+++ b/Library/ENV/pkgconfig/10.9/zlib.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: zlib
+Description: zlib compression library
+Version: 1.2.5
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/Library/Formula/aria2.rb b/Library/Formula/aria2.rb
index 65a6e7fef..6890344fa 100644
--- a/Library/Formula/aria2.rb
+++ b/Library/Formula/aria2.rb
@@ -39,14 +39,8 @@ class Aria2 < Formula
       --without-libgcrypt
     ]
 
-    # system zlib and sqlite don't include .pc files
-    ENV["ZLIB_CFLAGS"] = "-I/usr/include"
-    ENV["ZLIB_LIBS"] = "-L/usr/lib -lz"
-    ENV["SQLITE3_CFLAGS"] = "-I/usr/include"
-    ENV["SQLITE3_LIBS"] = "-L/usr/lib -lsqlite3"
-
     system "./configure", *args
-    system "make install"
+    system "make", "install"
 
     bash_completion.install "doc/bash_completion/aria2c"
   end
diff --git a/Library/Formula/mkvtoolnix.rb b/Library/Formula/mkvtoolnix.rb
index 27e03e80e..acbeb2d9f 100644
--- a/Library/Formula/mkvtoolnix.rb
+++ b/Library/Formula/mkvtoolnix.rb
@@ -73,9 +73,6 @@ class Mkvtoolnix < Formula
   def install
     ENV.cxx11
 
-    ENV["ZLIB_CFLAGS"] = "-I/usr/include"
-    ENV["ZLIB_LIBS"] = "-L/usr/lib -lz"
-
     boost = Formula["boost"]
     ogg = Formula["libogg"]
     vorbis = Formula["libvorbis"]
diff --git a/Library/Formula/pdf2htmlex.rb b/Library/Formula/pdf2htmlex.rb
index e5f67ef68..355f68687 100644
--- a/Library/Formula/pdf2htmlex.rb
+++ b/Library/Formula/pdf2htmlex.rb
@@ -54,27 +54,14 @@ class Pdf2htmlex < Formula
       # Fix linker error; see: http://trac.macports.org/ticket/25012
       ENV.append "LDFLAGS", "-lintl"
 
-      # And fix the zlib hunting.
-      ENV.append "ZLIB_CFLAGS", "-I/usr/include"
-      ENV.append "ZLIB_LIBS", "-L/usr/lib -lz"
-
       # Reset ARCHFLAGS to match how we build
       ENV["ARCHFLAGS"] = "-arch #{MacOS.preferred_arch}"
 
       system "./autogen.sh"
       system "./configure", *args
 
-      # Fix hard-coded install locations that don't respect the target bindir
-      inreplace "Makefile", "/Applications", "$(prefix)"
-
       system "make"
       system "make", "install"
-
-      # Fix breaking zlib pkg-config file issue.
-      inreplace "#{prefix}/fontforge/lib/pkgconfig/libfontforge.pc", "zlib", " "
-
-      # Fix breaking zlib pkg-config file issue number 2.
-      inreplace "#{prefix}/fontforge/lib/pkgconfig/libfontforgeexe.pc", "zlib", " "
     end
 
     # Prepend the paths to always find this dep fontforge instead of another.
diff --git a/Library/Formula/spdylay.rb b/Library/Formula/spdylay.rb
index 824e10618..b28a90734 100644
--- a/Library/Formula/spdylay.rb
+++ b/Library/Formula/spdylay.rb
@@ -25,9 +25,6 @@ class Spdylay < Formula
     system "automake"
     system "autoconf"
 
-    ENV["ZLIB_CFLAGS"] = "-I/usr/include"
-    ENV["ZLIB_LIBS"] = "-L/usr/lib -lz"
-
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make", "install"