lots of little cleanups: audit licenses, add HOMEPAGE variables, use …

…MODPY_* variables instead of hardcoding, etc.
mdempsky · Mar 1, 2011 · 9d623ec · 9d623ec
1 parent 56eebbf
commit 9d623ec
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 28 deletions.
diff --git a/ports/cad/heekscad/Makefile b/ports/cad/heekscad/Makefile
@@ -1,3 +1,5 @@
+# $OpenBSD$
+
 # XXX: Make HeeksCNC into a subpackage or maybe split into a separate port?
 
 COMMENT =		HeeksCAD
@@ -15,22 +17,23 @@ SHARED_LIBS =		heeksintf 0.0 \
 
 CATEGORIES =		cad
 
-# GPLv?
+HOMEPAGE =		http://www.heeks.net/
+
+# 3-clause BSD
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-
-# "make port-lib-depends-check" can help
 WANTLIB = FWOSPlugin GL GLU TKAdvTools TKBO TKBRep TKBool TKCAF
 WANTLIB += TKCDF TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase
 WANTLIB += TKHLR TKIGES TKLCAF TKMath TKMesh TKOffset TKPLCAF
 WANTLIB += TKPShape TKPrim TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase
 WANTLIB += TKSTL TKService TKShHealing TKShapeSchema TKTopAlgo
 WANTLIB += TKV2d TKV3d TKVRML TKXCAF TKXCAFSchema TKXDESTEP TKXSBase
-WANTLIB += TKernel c m pthread python2.6 util wx_base wx_gtk2_aui
-WANTLIB += wx_gtk2_core wx_gtk2_gl
+WANTLIB += TKernel c m pthread util wx_base wx_gtk2_aui wx_gtk2_core
+WANTLIB += wx_gtk2_gl
+WANTLIB += ${MODPY_WANTLIB}
 
 CONFIGURE_ENV =         CFLAGS="${CFLAGS} -I${X11BASE}/include" \
                         CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
@@ -74,7 +77,8 @@ do-install:
 
 
 
-# Copied from www/chromium, because warnings about #pragma push.
+# Copied from www/chromium, because warnings about #pragma push; shouldn't
+# be necessary once base gcc is fixed.
 MODULES+=       gcc4
 MODGCC4_LANGS = c c++
 MODGCC4_ARCHES = i386 amd64

diff --git a/ports/cad/libactp/Makefile b/ports/cad/libactp/Makefile
@@ -1,24 +1,22 @@
+# $OpenBSD$
+
 COMMENT =		libactp
 
 V = 			44
 DISTNAME =		libactp-${V}
 
-# for any port that creates shared libraries.
-# both libtool and cmake handle this automatically.
-# for libtool-based ports, have a look at WRKBUILD/shared_libs.log
-#SHARED_LIBS =		???
-
-# the category used in the directory name, /usr/ports/<category>/portname,
-# must be included and listed first.
 CATEGORIES =		cad
 
-# GPL?
+HOMEPAGE =		http://code.google.com/p/libactp/
+
+# mix of GPLv2+ and GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB += m python2.6 stdc++ util
+WANTLIB =		m stdc++ util
+WANTLIB +=		${MODPY_WANTLIB}
 
 WRKSRC =		${WRKDIST}/PythonLib
 

diff --git a/ports/cad/libarea/Makefile b/ports/cad/libarea/Makefile
@@ -1,24 +1,22 @@
+# $OpenBSD$
+
 COMMENT =		libarea
 
 V = 			83
 DISTNAME =		libarea-${V}
 
-# for any port that creates shared libraries.
-# both libtool and cmake handle this automatically.
-# for libtool-based ports, have a look at WRKBUILD/shared_libs.log
-#SHARED_LIBS =		???
-
-# the category used in the directory name, /usr/ports/<category>/portname,
-# must be included and listed first.
 CATEGORIES =		cad
 
-# GPL?
+HOMEPAGE =		http://code.google.com/p/libactp/
+
+# mix of GPLv3, 3-clause BSD, and Boost (MIT-like)
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB = boost_python m python2.6 stdc++ util
+WANTLIB =		boost_python m stdc++ util
+WANTLIB +=		${MODPY_WANTLIB}
 
 USE_GMAKE =		Yes
 

diff --git a/ports/cad/opencamlib/Makefile b/ports/cad/opencamlib/Makefile
@@ -29,8 +29,8 @@ MODULES =		devel/cmake \
 LIB_DEPENDS =		devel/boost
 
 pre-configure:
-	ln -sf ${LOCALBASE}/bin/python2.6 ${WRKDIR}/bin/python
-	ln -sf ${LOCALBASE}/bin/python2.6-config ${WRKDIR}/bin/python-config
+	ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
+	ln -sf ${MODPY_BIN}-config ${WRKDIR}/bin/python-config
 
 # XXX: Silly workaround for lack of proper upstream releases.
 makedistfile:

diff --git a/ports/cad/openscad/Makefile b/ports/cad/openscad/Makefile
@@ -8,7 +8,9 @@ DISTNAME =		openscad-${V}
 
 CATEGORIES =		cad
 
-# GPLv2 with CGAL exception; see http://www.openscad.org/#download
+HOMEPAGE =		http://www.openscad.org/
+
+# GPLv2+ with CGAL exception
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes

diff --git a/ports/graphics/opencsg/Makefile b/ports/graphics/opencsg/Makefile
@@ -8,7 +8,9 @@ SHARED_LIBS =		opencsg		0.0
 
 CATEGORIES =		graphics
 
-# GPLv2; see http://www.opencsg.org/#license
+HOMEPAGE =		http://www.opencsg.org/
+
+# GPLv2 with CGAL exception
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes

diff --git a/ports/math/cgal/Makefile b/ports/math/cgal/Makefile
@@ -14,6 +14,8 @@ SHARED_LIBS =		CGAL		0.0 \
 
 CATEGORIES =		math
 
+HOMEPAGE =		http://www.cgal.org/
+
 # mix of LGPLv2.1 and QPL; see http://www.cgal.org/license.html
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes