Convert to qmake.port.mk, shaving 7 lines from Makefile and not needed
anymore patch. The qmake.port.mk takes care of CXXFLAGS already. As a bonus, add @bin marker in PLIST, thus REVISION bump.
This commit is contained in:
parent
0121377633
commit
5700fe5c62
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2013/03/11 11:10:53 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2016/12/26 09:14:29 zhuk Exp $
|
||||
|
||||
COMMENT= visualize and manipulate mathematical models
|
||||
|
||||
DISTNAME= k3dsurf-0.6.2
|
||||
REVISION = 4
|
||||
REVISION = 5
|
||||
CATEGORIES= graphics math
|
||||
|
||||
HOMEPAGE= http://k3dsurf.sourceforge.net/
|
||||
@ -15,7 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3dsurf/}
|
||||
|
||||
WANTLIB= GL GLU X11 Xext Xmu c m pthread stdc++
|
||||
|
||||
MODULES= x11/qt3
|
||||
MODULES= x11/qt3 devel/qmake
|
||||
NO_TEST= Yes
|
||||
|
||||
PORTHOME= ${WRKDIR}
|
||||
@ -23,19 +23,12 @@ PORTHOME= ${WRKDIR}
|
||||
# fix to avoid gcc generating a huge uncompilable intermediate assembly
|
||||
.if ${MACHINE_ARCH} == "hppa"
|
||||
CXXFLAGS += -O0
|
||||
CONFIGURE_ENV += OPENSOURCE_CXXFLAGS="${CXXFLAGS}"
|
||||
.endif
|
||||
|
||||
SUBST_VARS+= CXX CXXFLAGS
|
||||
|
||||
do-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/src/src.pro
|
||||
cd ${WRKDIST} && ${LOCALBASE}/bin/qmake
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
|
||||
${INSTALL_DATA} ${WRKSRC}/icon/catenoid_mini_64x64.png \
|
||||
${PREFIX}/share/pixmaps/k3dsurf.png
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/k3dsurf ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/bin/k3dsurf ${PREFIX}/bin
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,10 +0,0 @@
|
||||
$OpenBSD: patch-src_src_pro,v 1.3 2010/05/24 11:57:57 landry Exp $
|
||||
--- src/src.pro.orig Mon May 14 00:22:46 2007
|
||||
+++ src/src.pro Fri Jun 15 13:19:06 2007
|
||||
@@ -61,3 +61,6 @@ thread \
|
||||
qt \
|
||||
opengl
|
||||
TARGET = ../bin/k3dsurf
|
||||
+QMAKE_CXX = ${CXX}
|
||||
+QMAKE_LINK = ${CXX}
|
||||
+QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2007/06/15 11:49:01 ajacoutot Exp $
|
||||
bin/k3dsurf
|
||||
@comment $OpenBSD: PLIST,v 1.3 2016/12/26 09:14:29 zhuk Exp $
|
||||
@bin bin/k3dsurf
|
||||
share/pixmaps/
|
||||
share/pixmaps/k3dsurf.png
|
||||
|
Loading…
Reference in New Issue
Block a user