From f11c334dd2e6bc39c31093adaee9a431070e93fb Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 30 Apr 2007 11:06:44 +0000
Subject: [PATCH] - Add required symlinks to the shared object, so that putting
 openjpeg   into LIB_DEPENDS and linking with just '-lopenjpeg' actually work
 - Tidy the port a bit

Submitted by:	alepulver
Approved by:	miwi (mentor)
---
 graphics/openjpeg/Makefile             | 23 +++++++++++++++--------
 graphics/openjpeg/files/patch-Makefile |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 877f1ef1ec39..41de3f870318 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -7,24 +7,31 @@
 
 PORTNAME=	openjpeg
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openjpeg.org/
-DISTNAME=	openjpeg_v1_1_1
+DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	trasz@freebsd.org
 COMMENT=	An open-source JPEG 2000 codec
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+WRKSRC=		${WRKDIR}/OpenJPEG
 
-WRKSRC=		${WRKDIR}/OpenJPEG/
-PLIST_FILES=	lib/libopenjpeg.a lib/libopenjpeg-1.0.0.so include/openjpeg.h
-CFLAGS+=	"-fPIC"
-USE_LDCONFIG=	yes
+PLIST_FILES=	include/openjpeg.h \
+		lib/libopenjpeg.a \
+		lib/libopenjpeg.so.${SHLIB_VER} \
+		lib/libopenjpeg.so
+
+SHLIB_VER=	1
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/dist/libopenjpeg.a ${PREFIX}/lib/
-		${INSTALL_PROGRAM} ${WRKSRC}/dist/libopenjpeg-1.0.0.so ${PREFIX}/lib/
-		${INSTALL_DATA} ${WRKSRC}/dist/openjpeg.h ${PREFIX}/include/
+		${INSTALL_DATA} ${WRKSRC}/dist/openjpeg.h ${PREFIX}/include
+		${INSTALL_DATA} ${WRKSRC}/dist/libopenjpeg.a ${PREFIX}/lib
+		${INSTALL_PROGRAM} ${WRKSRC}/dist/libopenjpeg-1.0.0.so \
+			${PREFIX}/lib/libopenjpeg.so.${SHLIB_VER}
+		cd ${PREFIX}/lib && \
+			${LN} -sf libopenjpeg.so.${SHLIB_VER} libopenjpeg.so
 
 .include <bsd.port.mk>
diff --git a/graphics/openjpeg/files/patch-Makefile b/graphics/openjpeg/files/patch-Makefile
index 4c264b8ec7d8..75bcc893bf6e 100644
--- a/graphics/openjpeg/files/patch-Makefile
+++ b/graphics/openjpeg/files/patch-Makefile
@@ -14,7 +14,7 @@
  DOS2UNIX = dos2unix
  
 -COMPILERFLAGS = -O3 -fPIC
-+COMPILERFLAGS := $(CFLAGS)
++COMPILERFLAGS := $(CFLAGS) -fPIC
  LIBRARIES = -lstdc++
  
  MODULES = $(SRCS:.c=.o)