Update of /cvsroot/pure-data/packages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1376
Modified Files: Makefile Makefile.buildlayout Log Message: added patch to completely fix the versioning and move the PD_VERSION replacement to 'make install'; 'make unpatch_pd' now does the reverse of 'make patch_pd'; and PD_TEST_VERSION is now retrieved from m_pd.h
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Makefile 22 Feb 2006 06:13:49 -0000 1.27 --- Makefile 27 Feb 2006 17:45:54 -0000 1.28 *************** *** 642,651 **** @echo pd_src $(pd_src) # apply all platform-neutral patches ! for patch in $(wildcard $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ done # apply all platform-specific patches ! for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ --- 642,651 ---- @echo pd_src $(pd_src) # apply all platform-neutral patches ! for patch in $(shell ls -1 $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ done # apply all platform-specific patches ! for patch in $(shell ls -1 $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 < $$patch; \ *************** *** 669,678 **** mv m_pd.h.tmp m_pd.h # apply all platform-specific patches ! for patch in $(wildcard $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done # apply all platform-neutral patches ! for patch in $(wildcard $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ --- 669,678 ---- mv m_pd.h.tmp m_pd.h # apply all platform-specific patches ! for patch in $(shell ls -1r $(CWD)/patches/$(OS_NAME)/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \ done # apply all platform-neutral patches ! for patch in $(shell ls -1r $(CWD)/patches/*.patch); do \ echo "Applying $$patch"; \ cd $(pd_src)/src/ && patch -p0 -R < $$patch; \
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/packages/Makefile.buildlayout,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.buildlayout 27 Feb 2006 07:12:47 -0000 1.20 --- Makefile.buildlayout 27 Feb 2006 17:45:54 -0000 1.21 *************** *** 147,153 **** PD_BUGFIX_VERSION := $(shell grep PD_BUGFIX_VERSION $(pd_src)/src/m_pd.h | \ sed 's|^.define *PD_BUGFIX_VERSION *([0-9]*).*|\1|' ) ! ! PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) !
# release version for this distro --- 147,156 ---- PD_BUGFIX_VERSION := $(shell grep PD_BUGFIX_VERSION $(pd_src)/src/m_pd.h | \ sed 's|^.define *PD_BUGFIX_VERSION *([0-9]*).*|\1|' ) ! PD_TEST_VERSION := $(shell grep PD_TEST_VERSION $(pd_src)/src/m_pd.h | \ ! sed 's|^.define *PD_TEST_VERSION *"(.*)".*|\1|' ) ! PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) ! ifneq ($(PD_TEST_VERSION),) ! PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) ! endif
# release version for this distro