Remove graphics/openjpeg15 successor graphics/openjpeg

8 files changed, 1 insertions, 100 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 8c37f913f56..e3d7a4db660 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.848 2019/09/18 15:53:45 taca Exp $
+# $NetBSD: Makefile,v 1.849 2019/09/18 23:41:50 nia Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -374,7 +374,6 @@ SUBDIR+=	opendis
 SUBDIR+=	openexr
 SUBDIR+=	openimageio
 SUBDIR+=	openjpeg
-SUBDIR+=	openjpeg15
 SUBDIR+=	optipng
 SUBDIR+=	osg
 SUBDIR+=	oxygen-icons
diff --git a/graphics/openjpeg15/DESCR b/graphics/openjpeg15/DESCR
deleted file mode 100644
index e62fa18e2e1..00000000000
--- a/graphics/openjpeg15/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The OpenJPEG library is an open-source JPEG 2000 codec written in C.  It
-has been developed in order to promote the use of JPEG 2000 and is
-licensed under a BSD license.
diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
deleted file mode 100644
index 93972ef4c39..00000000000
--- a/graphics/openjpeg15/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2014/04/07 14:49:41 adam Exp $
-
-DISTNAME=	openjpeg-1.5.2
-PKGNAME=	${DISTNAME:S/openjpeg/openjpeg15/}
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjpeg.mirror/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.openjpeg.org/
-COMMENT=	JPEG 2000 library
-LICENSE=	2-clause-bsd
-
-USE_CMAKE=		yes
-
-CFLAGS+=	-DHAVE_POSIX_MEMALIGN
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/lcms2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openjpeg15/PLIST b/graphics/openjpeg15/PLIST
deleted file mode 100644
index 97eed281ca4..00000000000
--- a/graphics/openjpeg15/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2014/04/07 14:49:41 adam Exp $
-bin/image_to_j2k
-bin/j2k_dump
-bin/j2k_to_image
-include/openjpeg-1.5/openjpeg.h
-lib/libopenjpeg.so
-lib/libopenjpeg.so.5
-lib/libopenjpeg.so.${PKGVERSION}
-lib/openjpeg-1.5/OpenJPEGConfig.cmake
-lib/openjpeg-1.5/OpenJPEGTargets-noconfig.cmake
-lib/openjpeg-1.5/OpenJPEGTargets.cmake
-lib/pkgconfig/libopenjpeg1.pc
-man/man1/image_to_j2k.1
-man/man1/j2k_dump.1
-man/man1/j2k_to_image.1
-man/man3/libopenjpeg.3
-share/doc/openjpeg-1.5/CHANGES
-share/doc/openjpeg-1.5/LICENSE
diff --git a/graphics/openjpeg15/buildlink3.mk b/graphics/openjpeg15/buildlink3.mk
deleted file mode 100644
index f7a2ae96d10..00000000000
--- a/graphics/openjpeg15/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/12/08 22:43:10 adam Exp $
-
-BUILDLINK_TREE+=	openjpeg15
-
-.if !defined(OPENJPEG15_BUILDLINK3_MK)
-OPENJPEG15_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.openjpeg15+=	openjpeg15>=1.5.1
-BUILDLINK_PKGSRCDIR.openjpeg15?=	../../graphics/openjpeg15
-.endif	# OPENJPEG15_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-openjpeg15
diff --git a/graphics/openjpeg15/distinfo b/graphics/openjpeg15/distinfo
deleted file mode 100644
index 947993f3dd2..00000000000
--- a/graphics/openjpeg15/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2016/04/01 11:53:06 jperkin Exp $
-
-SHA1 (openjpeg-1.5.2.tar.gz) = 496e99ff1d37b73bbce6a066dd9bd3576ebca0a2
-RMD160 (openjpeg-1.5.2.tar.gz) = 7b97b05e7a604da082ec8db03b6021b58537fb91
-SHA512 (openjpeg-1.5.2.tar.gz) = b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
-Size (openjpeg-1.5.2.tar.gz) = 1385702 bytes
-SHA1 (patch-CMakeLists.txt) = 11025cbeb92d943614903d6f7e4d36a4b0375686
-SHA1 (patch-aa) = 1b689282033f6fb032eb8720761c9e1fc7888834
diff --git a/graphics/openjpeg15/patches/patch-CMakeLists.txt b/graphics/openjpeg15/patches/patch-CMakeLists.txt
deleted file mode 100644
index 0c0957c1825..00000000000
--- a/graphics/openjpeg15/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2016/04/01 11:53:07 jperkin Exp $
-
-Correct MANDIR.
-
---- CMakeLists.txt.orig	2014-04-07 13:54:43.000000000 +0000
-+++ CMakeLists.txt
-@@ -129,7 +129,7 @@ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
- ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
- 
- IF(NOT OPENJPEG_INSTALL_MAN_DIR)
--  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
-+  SET(OPENJPEG_INSTALL_MAN_DIR "${CMAKE_INSTALL_MANDIR}/")
- ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
- 
- IF(NOT OPENJPEG_INSTALL_DOC_DIR)
diff --git a/graphics/openjpeg15/patches/patch-aa b/graphics/openjpeg15/patches/patch-aa
deleted file mode 100644
index 248d4fd67bf..00000000000
--- a/graphics/openjpeg15/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/12/08 22:43:10 adam Exp $
-
---- libopenjpeg/opj_malloc.h.orig	2012-09-13 07:58:39.000000000 +0000
-+++ libopenjpeg/opj_malloc.h
-@@ -80,16 +80,6 @@ Allocate memory aligned to a 16 byte bou
- 			#define HAVE_MM_MALLOC

- 		#endif

- 	#endif

--#else /* Not _WIN32 */

--	#if defined(__sun)

--		#define HAVE_MEMALIGN

--  #elif defined(__FreeBSD__)

--    #define HAVE_POSIX_MEMALIGN

--	/* Linux x86_64 and OSX always align allocations to 16 bytes */

--	#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)

--		#define HAVE_MEMALIGN

--		#include <malloc.h>			

--	#endif

- #endif

- 

- #define opj_aligned_malloc(size) malloc(size)