- Add dependency on pkgconfig when building with cairo support [1]

- Support staging
- Use option helpers

Reported by:	Andreas Nilsson via mail [1]

science/openbabel/Makefile

@@ -18,45 +18,21 @@ USES=		cmake:outsource
 CMAKE_ARGS=	-DBUILD_GUI=off
 USE_LDCONFIG=	yes
 
-MAN1=		babel.1 \
-		obabel.1 \
-		obchiral.1 \
-		obconformer.1 \
-		obenergy.1 \
-		obfit.1 \
-		obgen.1 \
-		obgrep.1 \
-		obgui.1 \
-		obminimize.1 \
-		obprobe.1 \
-		obprop.1 \
-		obrotamer.1 \
-		obrotate.1 \
-		obspectrophore.1 \
-		roundtrip.1
-
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	CAIRO PYTHON
 OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=	yes
+
 CAIRO_DESC=	PNG support via cairo library
+CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_USES=	pkgconfig
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
-PLIST_SUB+=	CAIRO=""
-.else
-PLIST_SUB+=	CAIRO="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 CMAKE_ARGS+=	-DPYTHON_BINDINGS=on
-PLIST_SUB+=	PYTHON=""
-.else
-PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 post-patch:

science/openbabel/pkg-plist

@@ -212,6 +212,22 @@ lib/openbabel/%%VERSION%%/zindoformat.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/openbabel.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pybel.py
 libdata/pkgconfig/openbabel-2.0.pc
+man/man1/babel.1.gz
+man/man1/obabel.1.gz
+man/man1/obchiral.1.gz
+man/man1/obconformer.1.gz
+man/man1/obenergy.1.gz
+man/man1/obfit.1.gz
+man/man1/obgen.1.gz
+man/man1/obgrep.1.gz
+man/man1/obgui.1.gz
+man/man1/obminimize.1.gz
+man/man1/obprobe.1.gz
+man/man1/obprop.1.gz
+man/man1/obrotamer.1.gz
+man/man1/obrotate.1.gz
+man/man1/obspectrophore.1.gz
+man/man1/roundtrip.1.gz
 share/openbabel/%%VERSION%%/MACCS.txt
 share/openbabel/%%VERSION%%/SMARTS_InteLigand.txt
 share/openbabel/%%VERSION%%/UFF.prm