- enable shared libraries

- do not build the python bindings, they're python version dependant
  and should be built separately
- move common parts from Makefile into Makefile.common for use by
  the python binding package Makefile
- add a patch for python/setup.py to add smsd.c to the sources
  which was obviously forgotten by the gammu team because they are
  building the extension with cmake.
- add a buildlink3.mk for the python bindings package

From Joachim König in private mail.
PKGREVISION++.

While here, make sure that some optional dependencies are not found
and that the bash completion script is not installed.

6 files changed, 60 insertions, 25 deletions

diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 6d8ece9b98d..034cf9fb96d 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -1,18 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/26 21:31:21 wiz Exp $
 #
 
-DISTNAME=	gammu-1.24.0
-CATEGORIES=	comms
-MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
-		http://mirror.clickcreations.com/gammu/releases/ \
-		http://dl.cihar.com.nyud.net/gammu/releases/ \
-		ftp://dl.cihar.com/gammu/releases/
-EXTRACT_SUFX=	.tar.bz2
+.include "Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cihar.com/gammu/
 COMMENT=	Command line utility and library to work with mobile phones
-LICENSE=	gnu-gpl-v2
+PKGREVISION=	1
 
 # cmake tests for it; unclear for what it would be used
 #BUILD_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
@@ -22,20 +14,24 @@ DEPENDS+=	dialog-[0-9]*:../../misc/dialog
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_CMAKE=	yes
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=	-DINSTALL_MAN_DIR:STRING=${PKGMANDIR}
+# see py-gammu:
+CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=OFF
+# make sure some optional dependencies are not found:
+CMAKE_ARGS+=	-DWITH_MySQL:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_Postgres:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_LibDBI:BOOL=OFF
+# avoid installing bash completion scripts
+CMAKE_ARGS+=	-DBASH_BIN:FILEPATH=
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash:run
 REPLACE_BASH=	utils/gammu-config utils/jadmaker
-PY_PATCHPLIST=	yes
 
 # needed because of https://bugs.cihar.com/view.php?id=908
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
-#-- MySQL not found.
-#-- Could not find PostgreSQL
-#-- libdbi not found.
-.include "../../lang/python/extension.mk"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/gammu/Makefile.common b/comms/gammu/Makefile.common
new file mode 100644
index 00000000000..221246da66a
--- /dev/null
+++ b/comms/gammu/Makefile.common
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile.common,v 1.1 2009/05/26 21:31:21 wiz Exp $
+#
+
+DISTNAME=	gammu-1.24.0
+CATEGORIES=	comms
+MASTER_SITES=	http://dl.cihar.com/gammu/releases/ \
+		http://mirror.clickcreations.com/gammu/releases/ \
+		http://dl.cihar.com.nyud.net/gammu/releases/ \
+		ftp://dl.cihar.com/gammu/releases/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://cihar.com/gammu/
+LICENSE=	gnu-gpl-v2
diff --git a/comms/gammu/PLIST b/comms/gammu/PLIST
index c3f69f9fac5..b0e2e97f081 100644
--- a/comms/gammu/PLIST
+++ b/comms/gammu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/05/26 21:31:21 wiz Exp $
 bin/gammu
 bin/gammu-config
 bin/gammu-smsd
@@ -33,14 +33,14 @@ include/gammu/gammu-types.h
 include/gammu/gammu-unicode.h
 include/gammu/gammu-wap.h
 include/gammu/gammu.h
-lib/libGammu.a
-lib/libgsmsd.a
+lib/libGammu.so
+lib/libGammu.so.6
+lib/libGammu.so.6.${PKGVERSION}
+lib/libgsmsd.so
+lib/libgsmsd.so.6
+lib/libgsmsd.so.6.${PKGVERSION}
 lib/pkgconfig/gammu-smsd.pc
 lib/pkgconfig/gammu.pc
-${PYSITELIB}/gammu/Data.py
-${PYSITELIB}/gammu/Worker.py
-${PYSITELIB}/gammu/__init__.py
-${PYSITELIB}/gammu/_gammu.so
 man/cs/man1/gammu-config.1
 man/cs/man1/gammu-smsd-inject.1
 man/cs/man1/gammu-smsd-monitor.1
@@ -189,5 +189,4 @@ share/locale/zh_TW/LC_MESSAGES/libgammu.mo
 @dirrm share/doc/gammu/devel/examples
 @dirrm share/doc/gammu/devel
 @dirrm share/doc/gammu
-@dirrm ${PYSITELIB}/gammu
 @dirrm include/gammu
diff --git a/comms/gammu/buildlink3.mk b/comms/gammu/buildlink3.mk
new file mode 100644
index 00000000000..686205291e7
--- /dev/null
+++ b/comms/gammu/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2009/05/26 21:31:21 wiz Exp $
+
+BUILDLINK_TREE+=	gammu
+
+.if !defined(GAMMU_BUILDLINK3_MK)
+GAMMU_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gammu+=	gammu>=1.24.0
+BUILDLINK_PKGSRCDIR.gammu?=	../../comms/gammu
+
+.endif	# GAMMU_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gammu
diff --git a/comms/gammu/distinfo b/comms/gammu/distinfo
index 2f96828c1f0..4abf8a7bbfc 100644
--- a/comms/gammu/distinfo
+++ b/comms/gammu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/05/25 12:50:00 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/05/26 21:31:21 wiz Exp $
 
 SHA1 (gammu-1.24.0.tar.bz2) = 9c4fc7474c33d3a40e6bf5a2efb7acbbf9b62dc5
 RMD160 (gammu-1.24.0.tar.bz2) = d525fa09dbcdba87cde6730edc5b55f0f412bd31
@@ -12,3 +12,4 @@ SHA1 (patch-af) = 28f77b55e463474f9796ce3f257c785a9755456b
 SHA1 (patch-ag) = 6849e39901f08ff402d9a43363c799cae3c6f44e
 SHA1 (patch-ai) = 1d3be730d1db223f5a1698e50ecb06ae7e4eec3e
 SHA1 (patch-aj) = db99dc9026ae8c70cf68e353f8fbd6ef8e4d20a7
+SHA1 (patch-ak) = 3ae3a776ca3a967bf53d89e3b168e2d929255e7a
diff --git a/comms/gammu/patches/patch-ak b/comms/gammu/patches/patch-ak
new file mode 100644
index 00000000000..750c1bfbb5b
--- /dev/null
+++ b/comms/gammu/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2009/05/26 21:31:21 wiz Exp $
+
+--- python/setup.py.orig	2009-05-25 21:28:01.000000000 +0200
++++ python/setup.py
+@@ -282,6 +282,7 @@ gammumodule = Extension('gammu._gammu',
+         'gammu/src/convertors/call.c',
+         'gammu/src/convertors/wap.c',
+         'gammu/src/gammu.c',
++        'gammu/src/smsd.c',
+         ])
+ 
+ setup (name = 'python-gammu',