CVS commit: pkgsrc/x11/py-sip

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Nov 22 02:25:12 UTC 2018

Modified Files:
        pkgsrc/x11/py-sip: Makefile
Added Files:
        pkgsrc/x11/py-sip: Makefile.common

Log Message:
py-sip: move bits to be shared with py-sip-qt5 to Makefile.common


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/x11/py-sip/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-sip/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-sip/Makefile
diff -u pkgsrc/x11/py-sip/Makefile:1.55 pkgsrc/x11/py-sip/Makefile:1.56
--- pkgsrc/x11/py-sip/Makefile:1.55     Sun Oct  7 09:00:09 2018
+++ pkgsrc/x11/py-sip/Makefile  Thu Nov 22 02:25:11 2018
@@ -1,59 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2018/10/07 09:00:09 adam Exp $
+# $NetBSD: Makefile,v 1.56 2018/11/22 02:25:11 markd Exp $
 
-DISTNAME=      sip-4.19.13
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    x11 devel python
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.riverbankcomputing.com/software/sip/
 COMMENT=       Tool to create Python bindings for C++ libraries
 
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
-
-CONFIGURE_ARGS+=       -b ${PREFIX}/bin
-CONFIGURE_ARGS+=       -d ${PREFIX}/${PYSITELIB}
-CONFIGURE_ARGS+=       -e ${PREFIX}/${PYINC}
-CONFIGURE_ARGS+=       -v ${PREFIX}/share/sip${PYVERSSUFFIX}
-CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:Q}
-CONFIGURE_ARGS+=       CXXFLAGS=${CXXFLAGS:Q}
-CONFIGURE_ARGS+=       INCDIR=${PREFIX}/include
-CONFIGURE_ARGS+=       LIBDIR=${PREFIX}/lib
-
-CONFIGURE_ARGS.DragonFly+=     -p freebsd-g++
-
-PY_PATCHPLIST=         yes
-
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=       CFLAGS_SHLIB=-fno-common
-CONFIGURE_ARGS+=       LFLAGS_PLUGIN="-bundle -flat_namespace -undefined suppress"
-.else
-CONFIGURE_ARGS+=       CFLAGS_SHLIB=-fPIC
-CONFIGURE_ARGS+=       CXXFLAGS_SHLIB=-fPIC
-.  if ${OPSYS} == "SunOS" && \
-      (!empty(CC_VERSION:Mgcc*) || !empty(PKGSRC_COMPILER:Mclang))
-CONFIGURE_ARGS+=       -p solaris-g++
-# gcc3 uses -mimpure-text to not pass -assert pure-text to the linker
-CONFIGURE_ARGS+=       LFLAGS_SHLIB="-shared -mimpure-text"
-.  else
-CONFIGURE_ARGS+=       LFLAGS_SHLIB="-shared"
-.  endif
-.endif
-CONFIGURE_ARGS+=       LFLAGS=${LDFLAGS:Q}
-
-# Hack: gcc on sparc64 miscompiles sipgen/parser.c at -O2
-.if ${MACHINE_ARCH} == "sparc64" && !empty(CC_VERSION:Mgcc*)
-BUILDLINK_TRANSFORM+=  rm:-O2
-.endif
-
-SUBST_CLASSES+=                pyversfx
-SUBST_STAGE.pyversfx=  pre-configure
-SUBST_FILES.pyversfx=  sipgen/sipgen.sbf
-SUBST_SED.pyversfx=    -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
+.include "../../x11/py-sip/Makefile.common"
 
 do-configure:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \

Added files:

Index: pkgsrc/x11/py-sip/Makefile.common
diff -u /dev/null pkgsrc/x11/py-sip/Makefile.common:1.1
--- /dev/null   Thu Nov 22 02:25:12 2018
+++ pkgsrc/x11/py-sip/Makefile.common   Thu Nov 22 02:25:11 2018
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile.common,v 1.1 2018/11/22 02:25:11 markd Exp $
+#
+# used by x11/py-sip/Makefile
+# used by x11/py-sip-qt5/Makefile
+
+DISTNAME=      sip-4.19.13
+CATEGORIES=    x11 devel python
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.riverbankcomputing.com/software/sip/
+
+DISTINFO_FILE=         ${.CURDIR}/../../x11/py-sip/distinfo
+PATCHDIR=              ${.CURDIR}/../../x11/py-sip/patches
+
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake
+
+CONFIGURE_ARGS+=       -b ${PREFIX}/bin
+CONFIGURE_ARGS+=       -d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+=       -e ${PREFIX}/${PYINC}
+CONFIGURE_ARGS+=       -v ${PREFIX}/share/sip${PYVERSSUFFIX}
+CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:Q}
+CONFIGURE_ARGS+=       CXXFLAGS=${CXXFLAGS:Q}
+CONFIGURE_ARGS+=       INCDIR=${PREFIX}/include
+CONFIGURE_ARGS+=       LIBDIR=${PREFIX}/lib
+
+CONFIGURE_ARGS.DragonFly+=     -p freebsd-g++
+
+PY_PATCHPLIST=         yes
+
+.include "../../mk/compiler.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=       CFLAGS_SHLIB=-fno-common
+CONFIGURE_ARGS+=       LFLAGS_PLUGIN="-bundle -flat_namespace -undefined suppress"
+.else
+CONFIGURE_ARGS+=       CFLAGS_SHLIB=-fPIC
+CONFIGURE_ARGS+=       CXXFLAGS_SHLIB=-fPIC
+.  if ${OPSYS} == "SunOS" && \
+      (!empty(CC_VERSION:Mgcc*) || !empty(PKGSRC_COMPILER:Mclang))
+CONFIGURE_ARGS+=       -p solaris-g++
+# gcc3 uses -mimpure-text to not pass -assert pure-text to the linker
+CONFIGURE_ARGS+=       LFLAGS_SHLIB="-shared -mimpure-text"
+.  else
+CONFIGURE_ARGS+=       LFLAGS_SHLIB="-shared"
+.  endif
+.endif
+CONFIGURE_ARGS+=       LFLAGS=${LDFLAGS:Q}
+
+# Hack: gcc on sparc64 miscompiles sipgen/parser.c at -O2
+.if ${MACHINE_ARCH} == "sparc64" && !empty(CC_VERSION:Mgcc*)
+BUILDLINK_TRANSFORM+=  rm:-O2
+.endif
+
+SUBST_CLASSES+=                pyversfx
+SUBST_STAGE.pyversfx=  pre-configure
+SUBST_FILES.pyversfx=  sipgen/sipgen.sbf
+SUBST_SED.pyversfx=    -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
+