From d00863a3cec21707b1b6ccf99b4f5bb7dee5ccf0 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 26 Sep 2010 20:14:25 +0000
Subject: [PATCH] Updated glpng .bep and .patch files, they now build the zip
 file, but there's a stray include directory also created that needs to be
 fixed still.

---
 media-libs/glpng/glpng-1.4.5.bep           |  6 ------
 media-libs/glpng/patches/glpng-1.4.5.patch | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/media-libs/glpng/glpng-1.4.5.bep b/media-libs/glpng/glpng-1.4.5.bep
index ec3e74c59..386babf10 100644
--- a/media-libs/glpng/glpng-1.4.5.bep
+++ b/media-libs/glpng/glpng-1.4.5.bep
@@ -7,17 +7,11 @@ STATUS_HAIKU="stable"
 DEPEND=""
 
 BUILD {
-	COMMONGLLIB='/boot/develop/headers/os/opengl/GL/'
-	mkdir -p COMMONGLLIB
-	cp include/GL/glpng.h ${COMMONGLLIB}glpng.h 
-	echo cp include/GL/glpng.h ${COMMONGLLIB}/glpng.h
 	cd src
 	make -f Makefile.HAIKU
 }
 
 INSTALL {
-	mkdir -p ${DESTDIR}${COMMONGLLIB}
-	cp include/GL/glpng.h ${DESTDIR}${COMMONGLLIB}/glpng.h 
 	cd src
 	make install -f Makefile.HAIKU
 }
diff --git a/media-libs/glpng/patches/glpng-1.4.5.patch b/media-libs/glpng/patches/glpng-1.4.5.patch
index c5315a195..95541e26b 100644
--- a/media-libs/glpng/patches/glpng-1.4.5.patch
+++ b/media-libs/glpng/patches/glpng-1.4.5.patch
@@ -1,11 +1,11 @@
 diff -Naurb src/Makefile.HAIKU glpng-1.4.5-haiku/src/Makefile.HAIKU
 --- src/Makefile.HAIKU	1970-01-01 00:00:00.000000000 +0000
 +++ src/Makefile.HAIKU	2010-07-05 02:35:34.000000000 +0000
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,30 @@
 +LDFLAGS=-lpng -lGL
 +SHAREDLIBFLAGS=-shared -fPIC
-+DESTDIR=/boot/common
-+LIB=lib
++LIBDIR:=$(shell finddir B_COMMON_LIB_DIRECTORY)
++GLINCLUDEDIR:=$(shell finddir B_COMMON_DEVELOP_DIRECTORY)/headers/os/opengl/GL
 +INCPATH	=	-I../include
 +
 +all: libglpng.a libglpng.so.1.45
@@ -23,13 +23,15 @@ diff -Naurb src/Makefile.HAIKU glpng-1.4.5-haiku/src/Makefile.HAIKU
 +	rm glpng.o libglpng.*
 +
 +install:
-+	for i in include ../include/GL $(LIB); do \
++	for i in include ../include/GL $(LIBDIR); do \
 +		install -m 755 -d $(DESTDIR)/$$i; \
 +	done
-+	install -p -m 644 ../include/GL/glpng.h $(DESTDIR)/include/GL
-+	install -m 755 libglpng.* $(DESTDIR)/$(LIB)
-+	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
-+	ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so
++	mkdir -p $(DESTDIR)$(GLINCLUDEDIR)
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	install -p -m 644 ../include/GL/glpng.h $(DESTDIR)$(GLINCLUDEDIR)
++	install -m 755 libglpng.* $(DESTDIR)$(LIBDIR)
++	ln -s -f libglpng.so.1.45 $(DESTDIR)$(LIBDIR)/libglpng.so.1
++	ln -s -f libglpng.so.1.45 $(DESTDIR)$(LIBDIR)/libglpng.so
 diff -Naurb src/glpng.c glpng-1.4.5-haiku/src/glpng.c
 --- src/glpng.c	2000-07-10 21:27:10.026738688 +0000
 +++ src/glpng.c	2010-07-05 02:47:05.069992448 +0000