CVS commit: pkgsrc/www/badwolf

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Feb  7 11:10:53 UTC 2023

Modified Files:
        pkgsrc/www/badwolf: Makefile

Log Message:
Run configure in the correct phase using HAS_CONFIGURE.
This is more inline with how it usualy works,
and the substitution framework is unneeded since the
configure script adheres to environment.
Set correct manpage install directory using env instead
of changing the configure file.
Sort buildlink3 includes.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/badwolf/Makefile

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

Modified files:

Index: pkgsrc/www/badwolf/Makefile
diff -u pkgsrc/www/badwolf/Makefile:1.18 pkgsrc/www/badwolf/Makefile:1.19
--- pkgsrc/www/badwolf/Makefile:1.18    Sun Jan 29 21:18:02 2023
+++ pkgsrc/www/badwolf/Makefile Tue Feb  7 11:10:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/01/29 21:18:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2023/02/07 11:10:53 nros Exp $
 
 DISTNAME=      badwolf-1.2.2
 PKGREVISION=   7
@@ -12,24 +12,16 @@ LICENSE=    modified-bsd
 
 USE_TOOLS+=    pkg-config
 
-SUBST_CLASSES+=                prefix
-SUBST_MESSAGE.prefix=  Fixing paths.
-SUBST_STAGE.prefix=    pre-configure
-SUBST_FILES.prefix+=   configure
-SUBST_SED.prefix+=     -e 's,/usr/local,${PREFIX},g'
-SUBST_SED.prefix+=     -e 's,share/man,${PKGMANDIR},g'
-SUBST_SED.prefix+=     -e 's/cc/${CC:Q}/'
-SUBST_SED.prefix+=     -e 's,^CFLAGS *= ,CFLAGS += ,'
+HAS_CONFIGURE= yes
+CONFIGURE_ENV+=        MANDIR=${PREFIX}/${PKGMANDIR}
 
-pre-configure:
-       cd ${WRKSRC} && ./configure
 
 TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
 TOOL_DEPENDS+= lcms2-[0-9]*:../../graphics/lcms2
 
-.include "../../www/webkit-gtk/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"