- Update to version 0.2.2

- Convert to OptionsNG, respect DOCS EXAMPLES
- Add LICENSE

While here:
- Add missing deps
- Port needs pkg-config during build
- Add desktop entry
- Fix COMMENT

PR:		ports/172221
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Feature safe:	yes

4 files changed, 98 insertions, 66 deletions

diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index cbacfb006c08..9ff1ac36f7e0 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -2,39 +2,82 @@
 # $FreeBSD$
 
 PORTNAME=	pdnmesh
-PORTVERSION=	0.2.1
-PORTREVISION=	11
+PORTVERSION=	0.2.2
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A finite element program
+COMMENT=	Finite element program
 
-LIB_DEPENDS=	gtkglext:${PORTSDIR}/x11-toolkits/gtkglext
+LICENSE=	GPLv2 # (or later)
 
-.include <bsd.port.pre.mk>
+LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
+		pcre:${PORTSDIR}/devel/pcre \
+		cairo:${PORTSDIR}/graphics/cairo \
+		drm:${PORTSDIR}/graphics/libdrm \
+		png15:${PORTSDIR}/graphics/png \
+		freetype:${PORTSDIR}/print/freetype2 \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \
+		xcb:${PORTSDIR}/x11/libxcb
 
-.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
-WITH_ATLAS=	yes
-.endif
-.if defined(WITH_ATLAS)
-LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
-BLAS=		-lf77blas
-LAPACK=		-lalapack -lcblas
-.else
-LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
-BLAS=		-lblas
-LAPACK=		-llapack
-.endif
+OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
+ATLAS_DESC=	Enable ATLAS support
 
 USE_FORTRAN=	yes
-CONFIGURE_ENV+=	BLAS_LIBS="${BLAS}" LAPACK_LIBS="${LAPACK}"
-USE_GL=		yes
+USE_GL=		glu
+USE_GETTEXT=	yes
+USE_ICONV=	yes
+USE_GNOME=	gdkpixbuf2 gtk20
+USE_PKGCONFIG=	build
+USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
+		xfixes xmu xi xinerama xrandr xrender xt xxf86vm
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+MAN1=		pdnmesh.1
+MAN5=		pdnmesh_input.5
+
+DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" "" "true"
+
+.include <bsd.port.options.mk>
 
-MAN1=	pdnmesh.1
-MAN5=	pdnmesh_input.5
+.if ${PORT_OPTIONS:MATLAS}
+LIB_DEPENDS+=	atlas:${PORTSDIR}/math/atlas
+CONFIGURE_ARGS+=--with-blas=cblas --with-lapack=alapack
+.else
+LIB_DEPENDS+=	blas:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	lapack:${PORTSDIR}/math/lapack
+CONFIGURE_ARGS+=--with-blas=blas --with-lapack=lapack
+.endif
+
+post-patch:
+	@${REINPLACE_CMD}-e \
+		'/^SUBDIRS/s|doc|| ; \
+		 s|^pkgdata_DATA|#pkgdata_DATA|' ${WRKSRC}/Makefile.in
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} \
+		&& ${INSTALL_DATA} ChangeLog ${DOCSDIR} \
+		&& ${INSTALL_DATA} README ${DOCSDIR})
+	@${MKDIR} ${DOCSDIR}/tutorial
+	(cd ${WRKSRC}/doc/tutorial \
+		&& ${INSTALL_DATA} README ${DOCSDIR}/tutorial \
+		&& ${INSTALL_DATA} tutorial.* ${DOCSDIR}/tutorial)
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@(${TAR} -C ${WRKSRC}/doc/examples --exclude "*Makefile*" -cf - . | \
+		${TAR} -C ${EXAMPLESDIR} --unlink -xf -)
+	@${FIND} ${EXAMPLESDIR} | ${XARGS} ${CHOWN} ${SHREOWN}:${SHAREGRP}
+	@${FIND} ${EXAMPLESDIR} -type d | ${XARGS} ${CHMOD} a+rx
+	@${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/pdnmesh/distinfo b/cad/pdnmesh/distinfo
index 4ed9dda32e23..d733ba01e0f3 100644
--- a/cad/pdnmesh/distinfo
+++ b/cad/pdnmesh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdnmesh-0.2.1.tar.gz) = af67231ff7767af479f08ec3cd9148c124016481c04a43c1b4bb429545409d29
-SIZE (pdnmesh-0.2.1.tar.gz) = 1590790
+SHA256 (pdnmesh-0.2.2.tar.gz) = 6ff31e2bf9ef9906a75f6ad37d37f4197bd4262f7dc4418a0c8f3898cd38e704
+SIZE (pdnmesh-0.2.2.tar.gz) = 1625961
diff --git a/cad/pdnmesh/files/patch-src+Makefile.in b/cad/pdnmesh/files/patch-src+Makefile.in
deleted file mode 100644
index 3b1020c13ea8..000000000000
--- a/cad/pdnmesh/files/patch-src+Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Wed Jan 17 16:58:18 2007
-+++ src/Makefile.in	Wed Jan 17 16:58:16 2007
-@@ -72,7 +72,7 @@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LAPACK_LIBS@ @BLAS_LIBS@ @FLIBS@ 
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
diff --git a/cad/pdnmesh/pkg-plist b/cad/pdnmesh/pkg-plist
index fc68307b8058..2cd41c9889b8 100644
--- a/cad/pdnmesh/pkg-plist
+++ b/cad/pdnmesh/pkg-plist
@@ -1,41 +1,41 @@
 bin/pdnmesh
-%%DATADIR%%/README
-%%DATADIR%%/COPYING
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/tutorial/README
-%%DATADIR%%/tutorial/tutorial.sgml.bz2
-%%DATADIR%%/tutorial/tutorial.html.bz2
-%%DATADIR%%/examples/README
-%%DATADIR%%/examples/coords.1
-%%DATADIR%%/examples/coords.10
-%%DATADIR%%/examples/coords.11
-%%DATADIR%%/examples/coords.1a
-%%DATADIR%%/examples/coords.2
-%%DATADIR%%/examples/coords.3
-%%DATADIR%%/examples/coords.4
-%%DATADIR%%/examples/coords.5
-%%DATADIR%%/examples/coords.6
-%%DATADIR%%/examples/coords.7
-%%DATADIR%%/examples/coords.8
-%%DATADIR%%/examples/coords.9
-%%DATADIR%%/examples/heat
-%%DATADIR%%/examples/flow
-%%DATADIR%%/examples/flow.1
-%%DATADIR%%/examples/heart
-%%DATADIR%%/examples/switch
-%%DATADIR%%/examples/trans
-%%DATADIR%%/pixmaps/open.xpm
-%%DATADIR%%/pixmaps/save.xpm
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/README
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial.html.bz2
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial.sgml.bz2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.11
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.1a
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coords.9
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flow
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flow.1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heart
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/switch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trans
 %%DATADIR%%/pixmaps/help_about.xpm
 %%DATADIR%%/pixmaps/next_eigenmode.xpm
+%%DATADIR%%/pixmaps/open.xpm
 %%DATADIR%%/pixmaps/plot_cont.xpm
 %%DATADIR%%/pixmaps/plot_fill.xpm
 %%DATADIR%%/pixmaps/plot_grad.xpm
 %%DATADIR%%/pixmaps/plot_mesh.xpm
+%%DATADIR%%/pixmaps/save.xpm
 %%DATADIR%%/pixmaps/zoom_all.xpm
 %%DATADIR%%/pixmaps/zoom_back.xpm
 %%DATADIR%%/pixmaps/zoom_window.xpm
-@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/tutorial
 @dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%