===================================================================
RCS file: /cvs/ports/graphics/jp2a/Makefile,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -r1.3 -r1.8
--- ports/graphics/jp2a/Makefile	2009/02/26 18:32:46	1.3
+++ ports/graphics/jp2a/Makefile	2014/08/15 08:47:59	1.8
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2009/02/26 18:32:46 yason Exp $
+# $OpenBSD: Makefile,v 1.8 2014/08/15 08:47:59 kirby Exp $
 
 COMMENT = 		small utility that converts JPG images to ASCII 
 
@@ -8,43 +8,36 @@
 
 HOMEPAGE = 		http://csl.sublevel3.org/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
 
 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
 
-CONFIGURE_STYLE = 	autoconf
-AUTOCONF_VERSION = 	2.60
+TEST_DEPENDS = 	shells/bash
 
-CONFIGURE_ARGS = 	--with-jpeg-lib=${LOCALBASE}/lib/
+CONFIGURE_STYLE = 	gnu
+CONFIGURE_ENV += 	LDFLAGS=-L${LOCALBASE}/lib/
 
-pre-configure:
+TEST_TARGET = 	test
+
+post-configure:
+	@perl -pi -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
+		${WRKSRC}/tests/run-tests.sh
 	@perl -pi -e 's|--strip-trailing-cr --brief|-b|g' \
 		${WRKSRC}/tests/run-tests.sh
-	@perl -pi -e 's|../src/jp2a|${PREFIX}/bin/jp2a|g' \
-		${WRKSRC}/tests/run-tests.sh
 
 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
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jp2a
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jp2a/tests
-	${INSTALL_DATA} ${WRKSRC}/tests/* \
-		${PREFIX}/share/examples/jp2a/tests
+.for i in AUTHORS COPYING LICENSES
+	${INSTALL_DATA} ${WRKSRC}/$i \
+		${PREFIX}/share/doc/jp2a/$i
+.endfor
 
 .include <bsd.port.mk>