===================================================================
RCS file: /cvs/ports/graphics/jp2a/Makefile,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -r1.5 -r1.10
--- ports/graphics/jp2a/Makefile	2009/09/20 13:19:29	1.5
+++ ports/graphics/jp2a/Makefile	2022/01/12 17:36:54	1.10
@@ -1,36 +1,32 @@
-# $OpenBSD: Makefile,v 1.5 2009/09/20 12:19:29 yason Exp $
+# $OpenBSD: Makefile,v 1.10 2022/01/12 17:36:54 kirby Exp $
 
-COMMENT = 		small utility that converts JPG images to ASCII 
+COMMENT = 		small utility that converts JPG images to ASCII
 
 DISTNAME = 		jp2a-1.0.6
 
 CATEGORIES = 		graphics
 
-HOMEPAGE = 		http://csl.sublevel3.org/jp2a/ 
+HOMEPAGE = 		https://csl.name/jp2a/
 
-MAINTAINER = 		Kirill Bychkov <yason@linklevel.net>
+MAINTAINER = 		Kirill Bychkov <kirby@openbsd.org>
 
 # GPL
-PERMIT_PACKAGE_CDROM = 	Yes
-PERMIT_PACKAGE_FTP = 	Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = 	Yes
+PERMIT_PACKAGE = 	Yes
 
 MASTER_SITES=           ${MASTER_SITE_SOURCEFORGE:=jp2a/}
 
-WANTLIB = 		c crypto ncurses ssl z
-LIB_DEPENDS = 		jpeg::graphics/jpeg \
-			idn::devel/libidn \
-			curl::net/curl
+WANTLIB = 		c crypto curl idn jpeg ncurses ssl z
+LIB_DEPENDS = 		graphics/jpeg \
+			devel/libidn \
+			net/curl
 
-REGRESS_DEPENDS = 	::shells/bash
+TEST_DEPENDS = 	shells/bash
 
 CONFIGURE_STYLE = 	gnu
+CONFIGURE_ENV += 	LDFLAGS=-L${LOCALBASE}/lib/
 
-CONFIGURE_ARGS = 	--with-jpeg-lib=${LOCALBASE}/lib/
+TEST_TARGET = 	test
 
-REGRESS_TARGET = 	test
-
 post-configure:
 	@perl -pi -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
 		${WRKSRC}/tests/run-tests.sh
@@ -39,11 +35,9 @@
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jp2a
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS \
-		${PREFIX}/share/doc/jp2a/AUTHORS
-	${INSTALL_DATA} ${WRKSRC}/COPYING \
-		${PREFIX}/share/doc/jp2a/COPYING
-	${INSTALL_DATA} ${WRKSRC}/LICENSES \
-		${PREFIX}/share/doc/jp2a/LICENSES
+.for i in AUTHORS COPYING LICENSES
+	${INSTALL_DATA} ${WRKSRC}/$i \
+		${PREFIX}/share/doc/jp2a/$i
+.endfor
 
 .include <bsd.port.mk>