CVS commit: pkgsrc/www/webkit24-gtk

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Mar 17 13:37:11 UTC 2020

Modified Files:
        pkgsrc/www/webkit24-gtk: Makefile Makefile.common

Log Message:
webkit24-gtk: move an if clause from Makefile to Makefile.common


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/www/webkit24-gtk/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/webkit24-gtk/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/www/webkit24-gtk/Makefile
diff -u pkgsrc/www/webkit24-gtk/Makefile:1.31 pkgsrc/www/webkit24-gtk/Makefile:1.32
--- pkgsrc/www/webkit24-gtk/Makefile:1.31       Tue Mar 10 22:09:04 2020
+++ pkgsrc/www/webkit24-gtk/Makefile    Tue Mar 17 13:37:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/03/10 22:09:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2020/03/17 13:37:11 tnn Exp $
 
 PKGREVISION= 27
 .include "Makefile.common"
@@ -10,10 +10,6 @@ COMMENT=     GTK2 port of the WebKit browser
 CONFIGURE_ARGS+=       --with-gtk=2.0
 CONFIGURE_ARGS+=       --disable-webkit2
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
-LDFLAGS+=      -Wl,-no-keep-memory -Wl,-reduce-memory
-.endif
-
 #introspection support
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.24.17nb3
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/www/webkit24-gtk/Makefile.common
diff -u pkgsrc/www/webkit24-gtk/Makefile.common:1.16 pkgsrc/www/webkit24-gtk/Makefile.common:1.17
--- pkgsrc/www/webkit24-gtk/Makefile.common:1.16        Sun Dec 15 15:38:59 2019
+++ pkgsrc/www/webkit24-gtk/Makefile.common     Tue Mar 17 13:37:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2019/12/15 15:38:59 taca Exp $
+# $NetBSD: Makefile.common,v 1.17 2020/03/17 13:37:11 tnn Exp $
 # used by www/webkit24-gtk/Makefile
 # used by www/webkit24-gtk3/Makefile
 
@@ -77,6 +77,10 @@ CONFIGURE_ARGS+=     --disable-fast-malloc
 CPPFLAGS+=             -DUSE_SYSTEM_MALLOC
 .endif
 
+.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
+LDFLAGS+=      -Wl,-no-keep-memory -Wl,-reduce-memory
+.endif
+
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"