6 files changed, 22 insertions, 86 deletions

diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index 5611fb77abdc..66c00a143ea2 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -21,16 +21,19 @@ CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
+.if defined(WITH_PYTHON_GAMMU)
+USE_PYTHON=	YES
+PLIST_SUB=	WITH_PYTHON_GAMMU=""
 .else
+PLIST_SUB=	WITH_PYTHON_GAMMU="@comment "
+.endif
+
 MAN1=		gammu.1 gammu-config.1 jadmaker.1 gammu-smsd.1 gammu-smsd-inject.1 \
 		gammu-smsd-monitor.1
 MAN5=		gammu-smsdrc.5 gammurc.5
 MAN7=		gammu-smsd-files.7 gammu-smsd-mysql.7 gammu-smsd-pgsql.7 \
 		gammu-smsd-dbi.7 gammu-smsd-tables.7
 PORTDOCS=	*
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/comms/gammu-devel/files/extra-patch-CMakeLists.txt b/comms/gammu-devel/files/extra-patch-CMakeLists.txt
deleted file mode 100644
index 8d289bbda171..000000000000
--- a/comms/gammu-devel/files/extra-patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig	2007-12-16 23:09:38.185441426 +0300
-+++ CMakeLists.txt	2007-12-16 23:12:28.043527300 +0300
-@@ -768,37 +768,6 @@
-     DESTINATION "${INSTALL_LIBDATA_DIR}/pkgconfig"
-     )
- 
--install (
--    FILES ${DOCS}
--    DESTINATION "${INSTALL_DOC_DIR}"
--    )
--
--install (
--    FILES ${SYMBIAN_FILES}
--    DESTINATION "${INSTALL_DOC_DIR}/symbian"
--    )
--
--foreach (DOC ${DEVELDOCS})
--    string (REGEX REPLACE "docs/develop(.*)/[^/]*$" "\\1" DIRNAME ${DOC})
--    install (
--        FILES ${DOC}
--        DESTINATION "${INSTALL_DOC_DIR}/devel/${DIRNAME}"
--        )
--endforeach (DOC)
--
--foreach (EXAMPLE ${EXAMPLES})
--    string (REGEX REPLACE "(docs/examples|other/php)(.*)/[^/]*$" "\\2" DIRNAME ${EXAMPLE})
--    install (
--        FILES ${EXAMPLE}
--        DESTINATION "${INSTALL_DOC_DIR}/examples/${DIRNAME}"
--        )
--endforeach (EXAMPLE)
--
--install (
--    FILES ${MAN1_PAGES}
--    DESTINATION "${INSTALL_MAN_DIR}/man1"
--    )
--
- add_subdirectory(common)
- 
- # Include tests, we build them also when cross compiling
diff --git a/comms/gammu-devel/pkg-plist b/comms/gammu-devel/pkg-plist
index 6fbeec57ef6b..e825fbfd8770 100644
--- a/comms/gammu-devel/pkg-plist
+++ b/comms/gammu-devel/pkg-plist
@@ -36,4 +36,9 @@ lib/libGammu.a
 lib/libgsmsd.a
 libdata/pkgconfig/gammu.pc
 libdata/pkgconfig/gammu-smsd.pc
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/__init__.py
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/_gammu.so
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/Data.py
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/Worker.py
 @dirrm include/gammu
+%%WITH_PYTHON_GAMMU%%@dirrm %%PYTHON_SITELIBDIR%%/gammu
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 5611fb77abdc..66c00a143ea2 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -21,16 +21,19 @@ CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES=files/extra-patch-CMakeLists.txt
+.if defined(WITH_PYTHON_GAMMU)
+USE_PYTHON=	YES
+PLIST_SUB=	WITH_PYTHON_GAMMU=""
 .else
+PLIST_SUB=	WITH_PYTHON_GAMMU="@comment "
+.endif
+
 MAN1=		gammu.1 gammu-config.1 jadmaker.1 gammu-smsd.1 gammu-smsd-inject.1 \
 		gammu-smsd-monitor.1
 MAN5=		gammu-smsdrc.5 gammurc.5
 MAN7=		gammu-smsd-files.7 gammu-smsd-mysql.7 gammu-smsd-pgsql.7 \
 		gammu-smsd-dbi.7 gammu-smsd-tables.7
 PORTDOCS=	*
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/comms/gammu/files/extra-patch-CMakeLists.txt b/comms/gammu/files/extra-patch-CMakeLists.txt
deleted file mode 100644
index 8d289bbda171..000000000000
--- a/comms/gammu/files/extra-patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig	2007-12-16 23:09:38.185441426 +0300
-+++ CMakeLists.txt	2007-12-16 23:12:28.043527300 +0300
-@@ -768,37 +768,6 @@
-     DESTINATION "${INSTALL_LIBDATA_DIR}/pkgconfig"
-     )
- 
--install (
--    FILES ${DOCS}
--    DESTINATION "${INSTALL_DOC_DIR}"
--    )
--
--install (
--    FILES ${SYMBIAN_FILES}
--    DESTINATION "${INSTALL_DOC_DIR}/symbian"
--    )
--
--foreach (DOC ${DEVELDOCS})
--    string (REGEX REPLACE "docs/develop(.*)/[^/]*$" "\\1" DIRNAME ${DOC})
--    install (
--        FILES ${DOC}
--        DESTINATION "${INSTALL_DOC_DIR}/devel/${DIRNAME}"
--        )
--endforeach (DOC)
--
--foreach (EXAMPLE ${EXAMPLES})
--    string (REGEX REPLACE "(docs/examples|other/php)(.*)/[^/]*$" "\\2" DIRNAME ${EXAMPLE})
--    install (
--        FILES ${EXAMPLE}
--        DESTINATION "${INSTALL_DOC_DIR}/examples/${DIRNAME}"
--        )
--endforeach (EXAMPLE)
--
--install (
--    FILES ${MAN1_PAGES}
--    DESTINATION "${INSTALL_MAN_DIR}/man1"
--    )
--
- add_subdirectory(common)
- 
- # Include tests, we build them also when cross compiling
diff --git a/comms/gammu/pkg-plist b/comms/gammu/pkg-plist
index 6fbeec57ef6b..e825fbfd8770 100644
--- a/comms/gammu/pkg-plist
+++ b/comms/gammu/pkg-plist
@@ -36,4 +36,9 @@ lib/libGammu.a
 lib/libgsmsd.a
 libdata/pkgconfig/gammu.pc
 libdata/pkgconfig/gammu-smsd.pc
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/__init__.py
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/_gammu.so
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/Data.py
+%%WITH_PYTHON_GAMMU%%%%PYTHON_SITELIBDIR%%/gammu/Worker.py
 @dirrm include/gammu
+%%WITH_PYTHON_GAMMU%%@dirrm %%PYTHON_SITELIBDIR%%/gammu