pkgsrc-Changes archive

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

CVS commit: pkgsrc/misc/php-orangehrm



Module Name:    pkgsrc
Committed By:   taca
Date:           Sun May 22 13:39:56 UTC 2022

Modified Files:
        pkgsrc/misc/php-orangehrm: Makefile

Log Message:
misc/php-orangehrm: fix build problem

* Remove "*.orig" files before install.
* Replace interpreter of bash scripts.
* Do not check interpreter for Symfony.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/php-orangehrm/Makefile

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

Modified files:

Index: pkgsrc/misc/php-orangehrm/Makefile
diff -u pkgsrc/misc/php-orangehrm/Makefile:1.11 pkgsrc/misc/php-orangehrm/Makefile:1.12
--- pkgsrc/misc/php-orangehrm/Makefile:1.11     Thu May  5 11:38:09 2022
+++ pkgsrc/misc/php-orangehrm/Makefile  Sun May 22 13:39:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/05/05 11:38:09 mef Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/22 13:39:56 taca Exp $
 #
 
 DISTNAME=      orangehrm-4.10.1
@@ -18,7 +18,7 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-pdo_mysql>=5
 PHP_VERSIONS_ACCEPTED= 56 74 80
 
 EXTRACT_USING=         bsdtar
-USE_TOOLS+=            pax
+USE_TOOLS+=            bash pax
 
 NO_BUILD=      yes
 
@@ -30,12 +30,15 @@ BUILD_DEFS+=                APACHE_GROUP APACHE_USER
 FILES_SUBST+=          WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
                        OHRDIR=${OHRDIR}
 
-CHECK_INTERPRETER_SKIP+=       share/orangehrm/symfony/lib/vendor/symfony/data/bin/symfony
-CHECK_INTERPRETER_SKIP+=       share/orangehrm/symfony/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/symfony
-CHECK_INTERPRETER_SKIP+=       share/orangehrm/symfony/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
-CHECK_INTERPRETER_SKIP+=       share/orangehrm/symfony/symfony
+REPLACE_BASH=  installer/cli_common_commands.sh installer/cli_install.sh \
+               travis-config-files/seeddb.sh
+
+CHECK_INTERPRETER_SKIP+=       share/orangehrm/symfony/*
 CHECK_INTERPRETER_SKIP+=       share/orangehrm/upgrader/symfony
 
+pre-install:
+       ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
+
 do-install:
        ${RM} -f symfony/lib/vendor/google/apiclient-services/generator/run_tests.sh.orig
        ${FIND} ${WRKSRC} -type f -exec ${CHMOD} og-w {} \;



Home | Main Index | Thread Index | Old Index