pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/swiftsurf Use the ocaml infrastructure.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/84acfef1ed65
branches:  trunk
changeset: 377226:84acfef1ed65
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Wed Mar 14 09:07:54 2018 +0000

description:
Use the ocaml infrastructure.

diffstat:

 www/swiftsurf/Makefile |  20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diffs (44 lines):

diff -r f97cb7ad464e -r 84acfef1ed65 www/swiftsurf/Makefile
--- a/www/swiftsurf/Makefile    Wed Mar 14 09:03:24 2018 +0000
+++ b/www/swiftsurf/Makefile    Wed Mar 14 09:07:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/03/14 09:03:24 dholland Exp $
+# $NetBSD: Makefile,v 1.31 2018/03/14 09:07:54 dholland Exp $
 
 DISTNAME=              swiftsurf-1.2.5
 PKGREVISION=           15
@@ -11,7 +11,14 @@
 
 USE_TOOLS+=            gmake
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+SUBST_CLASSES+=                conf
+SUBST_FILES.conf=      src/conf.ml
+SUBST_VARS.conf=       PKG_SYSCONFDIR
+SUBST_STAGE.conf=      pre-configure
+
+.include "../../mk/ocaml.mk"
+
+.if !empty(OCAML_USE_OPT_COMPILER:M[Yy][Ee][Ss])
 BUILD_TARGET=  nat
 SWIFT=         swift.opt
 .else
@@ -21,18 +28,9 @@
 
 INSTALLATION_DIRS=     bin share/doc/swiftsurf share/examples/swiftsurf
 
-SUBST_CLASSES+=                conf
-SUBST_FILES.conf=      src/conf.ml
-SUBST_VARS.conf=       PKG_SYSCONFDIR
-SUBST_STAGE.conf=      pre-configure
-
-do-build:
-       cd ${WRKSRC}/src && ${GMAKE} ${BUILD_TARGET}
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/${SWIFT} ${DESTDIR}${PREFIX}/bin/swiftsurf
        ${INSTALL_DATA} ${WRKSRC}/swiftsurf.* ${DESTDIR}${PREFIX}/share/examples/swiftsurf
        ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/swiftsurf
 
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index