From 655f589f3568fcdffbd658c6d45633ce19e097ae Mon Sep 17 00:00:00 2001 From: steven Date: Mon, 26 Dec 2005 15:44:01 +0000 Subject: [PATCH] SHARED_LIBS and USE_LIBTOOL --- graphics/jasper/Makefile | 7 ++++++- .../jasper/patches/patch-src_libjasper_Makefile_in | 11 ----------- graphics/jasper/pkg/PFRAG.shared | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 graphics/jasper/patches/patch-src_libjasper_Makefile_in diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index c820e601009..6b6fee9f974 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -1,8 +1,12 @@ -# $OpenBSD: Makefile,v 1.5 2005/10/30 00:10:40 fgsch Exp $ +# $OpenBSD: Makefile,v 1.6 2005/12/26 15:44:01 steven Exp $ COMMENT= "reference implementation of JPEG-2000" DISTNAME= jasper-1.701.0 +PKGNAME= ${DISTNAME}p0 +SHARED_LIBS= jasper 1.0 +MODGNU_SHARED_LIBS= jasper '' + CATEGORIES= graphics MASTER_SITES= ${HOMEPAGE}software/ EXTRACT_SUFX= .zip @@ -16,6 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c m +USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --without-x --disable-opengl diff --git a/graphics/jasper/patches/patch-src_libjasper_Makefile_in b/graphics/jasper/patches/patch-src_libjasper_Makefile_in deleted file mode 100644 index ddb55acd161..00000000000 --- a/graphics/jasper/patches/patch-src_libjasper_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_libjasper_Makefile_in,v 1.1.1.1 2004/05/14 05:33:57 brad Exp $ ---- src/libjasper/Makefile.in.orig 2004-04-22 21:58:42.000000000 -0400 -+++ src/libjasper/Makefile.in 2004-04-22 21:59:07.000000000 -0400 -@@ -186,7 +186,6 @@ libjasper_la_LIBADD = \ - ras/libras.la - - libjasper_la_LDFLAGS = \ -- -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - - subdir = src/libjasper diff --git a/graphics/jasper/pkg/PFRAG.shared b/graphics/jasper/pkg/PFRAG.shared index e8cc6eb4c24..3faebd101f9 100644 --- a/graphics/jasper/pkg/PFRAG.shared +++ b/graphics/jasper/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/10 14:01:02 espie Exp $ -@lib lib/libjasper.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 15:44:01 steven Exp $ +@lib lib/libjasper.so.${LIBjasper_VERSION}