3 files changed, 61 insertions, 2 deletions
diff --git a/net-mgmt/yabm/Makefile b/net-mgmt/yabm/Makefile
index 23706f8bcd12..c560c5f757fc 100644
--- a/net-mgmt/yabm/Makefile
+++ b/net-mgmt/yabm/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	yabm
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.shapeshifter.se/code/yabm/release/
 
 MAINTAINER=	fli@shapeshifter.se
 COMMENT=	Yet Another Bandwidth Meter, somewhat resembles the Linux bwbar
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=/etc/rc.subr
diff --git a/net-mgmt/yabm/files/patch-Makefile b/net-mgmt/yabm/files/patch-Makefile
new file mode 100644
index 000000000000..680280badd03
--- /dev/null
+++ b/net-mgmt/yabm/files/patch-Makefile
@@ -0,0 +1,49 @@
+--- src/mylibpng/Makefile.orig	2005-04-21 18:44:48.000000000 +0200
++++ src/mylibpng/Makefile	2012-05-06 18:42:26.000000000 +0200
+@@ -1,9 +1,10 @@
+ include ../../Makefile.inc
+ 
+-CFLAGS += -I${PREFIX}/include 
++CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+ OBJS	= mylibpng.o font.o
+ 
+ all::	${OBJS}
++	@touch done
+ 
+ clean::
+ 	@-rm ${OBJS}
+--- src/Makefile.orig	2005-04-21 18:44:48.000000000 +0200
++++ src/Makefile	2012-05-06 18:44:54.000000000 +0200
+@@ -3,9 +3,10 @@
+ DIRS		= mylibpng
+ OBJS		= yabm.o bw.o
+ 
+-all::	${DIRS} ${OBJS} 
++all::	${DIRS}/done ${OBJS}
++	@touch done
+ 
+-mylibpng: force_look
++mylibpng/done:
+ 	@cd mylibpng; ${MAKE}
+ 
+ force_look:
+--- Makefile.orig	2005-04-21 18:44:48.000000000 +0200
++++ Makefile	2012-05-06 18:44:32.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ LINK		= -lkvm -L${PREFIX}/lib -lpng 
+ 
+-all::	${DIRS} yabm
++all::	${DIRS}/done yabm
+ 
+ install:: 
+ 	${INSTALL} -o root -m 0755 ${BIN} ${PREFIX}/bin/${BIN}
+@@ -18,7 +18,7 @@
+ 		${MYLIBPNG_OBJS} \
+ 		${OBJS} ${LINK}
+ 
+-src: force_look
++src/done: force_look
+ 	@cd src; ${MAKE}
+ 
+ force_look:
diff --git a/net-mgmt/yabm/files/patch-mylibpng.c b/net-mgmt/yabm/files/patch-mylibpng.c
new file mode 100644
index 000000000000..aff8beab5321
--- /dev/null
+++ b/net-mgmt/yabm/files/patch-mylibpng.c
@@ -0,0 +1,10 @@
+--- src/mylibpng/mylibpng.c.orig	2005-04-21 18:44:48.000000000 +0200
++++ src/mylibpng/mylibpng.c	2012-05-06 06:45:47.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <errno.h>
+ 
+ #include <png.h>
++#include <pngpriv.h>
+ 
+ #include "mylibpng.h"
+