wok rev 24081

php-auth-pam: remove patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jul 09 16:30:40 2021 +0000 (2021-07-09)
parents 505527cf814f
children 4bae0fb81a17
files php-auth-pam/receipt php-auth-pam/stuff/php-auth-pam-Makefile.global0.4.u xxdiff/receipt
line diff
     1.1 --- a/php-auth-pam/receipt	Fri Jul 09 15:56:16 2021 +0000
     1.2 +++ b/php-auth-pam/receipt	Fri Jul 09 16:30:40 2021 +0000
     1.3 @@ -17,7 +17,6 @@
     1.4  compile_rules()
     1.5  {
     1.6  	phpize
     1.7 -	patch -p1 < $stuff/php-auth-pam-Makefile.global0.4.u || exit 1
     1.8  	sed -i 's/^function_entry/zend_&/;s/pval /zval /' pam_auth.c # php 5.4
     1.9  
    1.10  	sed -e 's|(\(\*[a-z]*)\)->value.str.val;|Z_STRVAL(*\1;|' \
    1.11 @@ -29,7 +28,7 @@
    1.12  	./configure $CONFIGURE_ARGS \
    1.13  		--prefix=/usr &&
    1.14  	
    1.15 -	make && make DESTDIR=$DESTDIR install
    1.16 +	make && make INSTALL_ROOT=$DESTDIR install
    1.17  }
    1.18  
    1.19  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/php-auth-pam/stuff/php-auth-pam-Makefile.global0.4.u	Fri Jul 09 15:56:16 2021 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,53 +0,0 @@
     2.4 ---- php-auth-pam-0.4-ori/Makefile.global	Sat May  8 09:06:20 2010
     2.5 -+++ php-auth-pam-0.4/Makefile.global	Sat May  8 09:07:58 2010
     2.6 -@@ -24,7 +24,7 @@
     2.7 - 
     2.8 - install-sapi: $(OVERALL_TARGET)
     2.9 - 	@echo "Installing PHP SAPI module:       $(PHP_SAPI)"
    2.10 --	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
    2.11 -+	-@$(mkinstalldirs) $(DESTDIR)$(INSTALL_ROOT)$(bindir)
    2.12 - 	-@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
    2.13 - 		for i in 0.0.0 0.0 0; do \
    2.14 - 			if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
    2.15 -@@ -37,19 +37,19 @@
    2.16 - 
    2.17 - install-modules: build-modules
    2.18 - 	@test -d modules && \
    2.19 --	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
    2.20 --	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/"
    2.21 -+	$(mkinstalldirs) $(DESTDIR)$(INSTALL_ROOT)$(EXTENSION_DIR)
    2.22 -+	@echo "Installing shared extensions:     $(DESTDIR)$(INSTALL_ROOT)$(EXTENSION_DIR)/"
    2.23 - 	@rm -f modules/*.la >/dev/null 2>&1
    2.24 --	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
    2.25 -+	@$(INSTALL) modules/* $(DESTDIR)$(INSTALL_ROOT)$(EXTENSION_DIR)
    2.26 - 
    2.27 - install-headers:
    2.28 - 	-@if test "$(INSTALL_HEADERS)"; then \
    2.29 - 		for i in `echo $(INSTALL_HEADERS)`; do \
    2.30 - 			i=`$(top_srcdir)/build/shtool path -d $$i`; \
    2.31 --			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
    2.32 -+			paths="$$paths $(DESTDIR)$(INSTALL_ROOT)$(phpincludedir)/$$i"; \
    2.33 - 		done; \
    2.34 - 		$(mkinstalldirs) $$paths && \
    2.35 --		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
    2.36 -+		echo "Installing header files:          $(DESTDIR)$(INSTALL_ROOT)$(phpincludedir)/" && \
    2.37 - 		for i in `echo $(INSTALL_HEADERS)`; do \
    2.38 - 			if test "$(PHP_PECL_EXTENSION)"; then \
    2.39 - 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
    2.40 -@@ -57,12 +57,12 @@
    2.41 - 				src=$$i; \
    2.42 - 			fi; \
    2.43 - 			if test -f "$(top_srcdir)/$$src"; then \
    2.44 --				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
    2.45 -+				$(INSTALL_DATA) $(top_srcdir)/$$src $(DESTDIR)$(INSTALL_ROOT)$(phpincludedir)/$$i; \
    2.46 - 			elif test -f "$(top_builddir)/$$src"; then \
    2.47 --				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
    2.48 -+				$(INSTALL_DATA) $(top_builddir)/$$src $(DESTDIR)$(INSTALL_ROOT)$(phpincludedir)/$$i; \
    2.49 - 			else \
    2.50 --				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
    2.51 --				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
    2.52 -+				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(INSTALL_ROOT)$(phpincludedir)/$$i; \
    2.53 -+				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
    2.54 - 			fi \
    2.55 - 		done; \
    2.56 - 	fi
     3.1 --- a/xxdiff/receipt	Fri Jul 09 15:56:16 2021 +0000
     3.2 +++ b/xxdiff/receipt	Fri Jul 09 16:30:40 2021 +0000
     3.3 @@ -14,11 +14,17 @@
     3.4  DEPENDS="libQtCore libQtGui"
     3.5  BUILD_DEPENDS="bison flex qmake Qt4-dev"
     3.6  
     3.7 +current_version()
     3.8 +{
     3.9 +	wget -O - https://sourceforge.net/projects/xxdiff/files/xxdiff/ 2>/dev/null | \
    3.10 +	sed "/$PACKAGE-/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|;q"
    3.11 +}
    3.12 +
    3.13  # Rules to configure and make the package.
    3.14  compile_rules()
    3.15  {
    3.16 -	patch -p1 < $stuff/bison-3.02.patch
    3.17  	cd	src
    3.18 +	patch -p2 < $stuff/bison-3.02.patch
    3.19  	make QMAKE=/usr/bin/qmake -f Makefile.bootstrap &&
    3.20  	make QMAKE=/usr/bin/qmake
    3.21  }