From 780c85bd950ae3d6782cfcfe630abe957c1434bb Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Sat, 12 Feb 2011 23:59:46 +0100 Subject: Updated feh formula. Made the formula less likely to break on upgrades by replacing the patch by environment variables set on install. Also removed the dependency on libpng. Closes #4221. Signed-off-by: Mike McQuaid --- Library/Formula/feh.rb | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'Library') diff --git a/Library/Formula/feh.rb b/Library/Formula/feh.rb index 12e40fe48..7d32d33e0 100644 --- a/Library/Formula/feh.rb +++ b/Library/Formula/feh.rb @@ -6,27 +6,12 @@ class Feh :build - depends_on 'libpng' => :build - - def patches - DATA - end def install + ENV.append "LDFLAGS", "-L/usr/X11/lib" + ENV.append "CFLAGS", "-I/usr/X11/include" + system "make" system "make", "PREFIX=#{prefix}", "install" end end - -__END__ -Patch to add X11 library path. - -diff --git a/config.mk b/config.mk -index 6a5b8b3..e301ff1 100644 ---- a/config.mk -+++ b/config.mk -@@ -31,3 +31,4 @@ CFLAGS += ${xinerama} -DPREFIX=\"${PREFIX}\" \ - -DPACKAGE=\"${PACKAGE}\" -DVERSION=\"${VERSION}\" - - LDLIBS += -lm -lpng -lX11 -lImlib2 -lgiblib ${xinerama_ld} -+LDFLAGS += -L/usr/X11/lib -- cgit v1.2.3