From 796f999aa522b38572e23f9f02c7b40cbab8fdd9 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Sat, 10 Jan 2015 16:28:30 +0300 Subject: [PATCH 1/4] dmake: Format --- mingw-w64-dmake/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-dmake/PKGBUILD b/mingw-w64-dmake/PKGBUILD index df7211b87b..8ce30182d7 100644 --- a/mingw-w64-dmake/PKGBUILD +++ b/mingw-w64-dmake/PKGBUILD @@ -2,7 +2,6 @@ # Contributor: Renato Silva _realname=dmake - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.12.2 pkgrel=3 @@ -34,6 +33,7 @@ build() { --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --build=${MINGW_CHOST} + make } From 7561f3c50fe5de0e4ae0d5f95e4cca9cd05cee44 Mon Sep 17 00:00:00 2001 From: Renato Silva Date: Sat, 10 Jan 2015 18:37:55 -0200 Subject: [PATCH 2/4] dmake: Fix configuration directory. * Configuration is now loaded from EXEDIR/../etc/dmake instead of EXEDIR/startup. * Some unused code has been removed from build(). --- mingw-w64-dmake/003-fix-config-location.patch | 47 +++++++++++++++++++ mingw-w64-dmake/PKGBUILD | 14 +++--- 2 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 mingw-w64-dmake/003-fix-config-location.patch diff --git a/mingw-w64-dmake/003-fix-config-location.patch b/mingw-w64-dmake/003-fix-config-location.patch new file mode 100644 index 0000000000..e4175e86af --- /dev/null +++ b/mingw-w64-dmake/003-fix-config-location.patch @@ -0,0 +1,47 @@ +diff -aur 002/startup/Makefile.in 003/startup/Makefile.in +--- 002/startup/Makefile.in 2012-02-07 12:36:47.000000000 -0200 ++++ 003/startup/Makefile.in 2015-01-10 17:51:06.418945300 -0200 +@@ -163,7 +163,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-startupdir = $(datadir)/startup ++startupdir = $(datadir) + startup_DATA = startup.mk config.mk + DIST_SUBDIRS = unix winnt + SUBDIRS = @OS_TYPE@ +diff -aur 002/startup/winnt/Makefile.in 003/startup/winnt/Makefile.in +--- 002/startup/winnt/Makefile.in 2012-02-07 12:36:46.000000000 -0200 ++++ 003/startup/winnt/Makefile.in 2015-01-10 18:12:18.143554600 -0200 +@@ -162,7 +162,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-startupdir = $(datadir)/startup/winnt ++startupdir = $(datadir)/winnt + startup_DATA = macros.mk recipes.mk + DIST_SUBDIRS = mingw msvc6 + SUBDIRS = @OS_VERSION@ +diff -aur 002/startup/winnt/mingw/Makefile.in 003/startup/winnt/mingw/Makefile.in +--- 002/startup/winnt/mingw/Makefile.in 2012-02-07 12:36:46.000000000 -0200 ++++ 003/startup/winnt/mingw/Makefile.in 2015-01-10 18:12:24.551757800 -0200 +@@ -154,7 +154,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-startupdir = $(datadir)/startup/winnt/mingw ++startupdir = $(datadir)/winnt/mingw + startup_DATA = macros.mk + all: all-am + +diff -aur 002/winnt/startup.h 003/winnt/startup.h +--- 002/winnt/startup.h 2012-02-07 12:36:53.000000000 -0200 ++++ 003/winnt/startup.h 2015-01-10 18:01:16.400390600 -0200 +@@ -24,6 +24,6 @@ + -- Use cvs log to obtain detailed change logs. + */ + +-"DMAKEROOT *= $(ABSMAKECMD:d)startup", ++"DMAKEROOT *= $(ABSMAKECMD:d)..\\etc\\dmake", + "MAKESTARTUP := $(DMAKEROOT)\\startup.mk", + diff --git a/mingw-w64-dmake/PKGBUILD b/mingw-w64-dmake/PKGBUILD index 8ce30182d7..4c2d7f9cf8 100644 --- a/mingw-w64-dmake/PKGBUILD +++ b/mingw-w64-dmake/PKGBUILD @@ -4,7 +4,7 @@ _realname=dmake pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.12.2 -pkgrel=3 +pkgrel=4 pkgdesc="Dmake is a make utility similar to GNU make or the Workshop dmake (mingw-w64)" arch=('any') groups=("${MINGW_PACKAGE_PREFIX}") @@ -14,24 +14,27 @@ license=('GPL') url="https://code.google.com/a/apache-extras.org/p/dmake/" source=("http://dmake.apache-extras.org.codespot.com/files/dmake-${pkgver}.tar.bz2" '001-detect-mingw.patch' - '002-disable-shell-environment-variable.patch') + '002-disable-shell-environment-variable.patch' + '003-fix-config-location.patch') md5sums=('9194f727c31d1db18bf5dd02e7b2dd09' 'a39a65958762b2877c994428978d0c3d' - '08c08cf2432bd7ffdce6759d4f6974d4') + '08c08cf2432bd7ffdce6759d4f6974d4' + 'a1f153d6c8199c11344027a18a4baa26') prepare() { cd ${srcdir}/dmake-${pkgver} patch -p1 -i ${srcdir}/001-detect-mingw.patch patch -p1 -i ${srcdir}/002-disable-shell-environment-variable.patch + patch -p1 -i ${srcdir}/003-fix-config-location.patch } build() { - unset SHELL mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH} - MSYSTEM=MINGW ../dmake-${pkgver}/configure \ + ../dmake-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ + --datarootdir=${MINGW_PREFIX}/etc/dmake \ --build=${MINGW_CHOST} make @@ -40,5 +43,4 @@ build() { package() { cd "${srcdir}/build-${CARCH}" make DESTDIR="${pkgdir}" install - mv "${pkgdir}${MINGW_PREFIX}/share/startup" "${pkgdir}${MINGW_PREFIX}/bin" } From 0d5552b2c554891208d15404075204e0311e52cf Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 10 Jan 2015 23:12:07 +0000 Subject: [PATCH 3/4] db: Update url --- mingw-w64-db/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-db/PKGBUILD b/mingw-w64-db/PKGBUILD index fe4f5fe3b5..3830a3c627 100644 --- a/mingw-w64-db/PKGBUILD +++ b/mingw-w64-db/PKGBUILD @@ -8,7 +8,7 @@ pkgver=6.0.30 pkgrel=1 pkgdesc="The Berkeley DB embedded database system (mingw-w64)" arch=('any') -url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +url="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html" license=('custom') groups=("${MINGW_PACKAGE_PREFIX}") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") From 55548f1dd51b6e30971fbf5294250a8d47d5a57e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 10 Jan 2015 23:17:04 +0000 Subject: [PATCH 4/4] python-bsddb3: Fix formatting --- mingw-w64-python-bsddb3/PKGBUILD | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/mingw-w64-python-bsddb3/PKGBUILD b/mingw-w64-python-bsddb3/PKGBUILD index 62c2606179..861cd81703 100644 --- a/mingw-w64-python-bsddb3/PKGBUILD +++ b/mingw-w64-python-bsddb3/PKGBUILD @@ -1,7 +1,6 @@ # Contributor: Josip _realname=bsddb3 - pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=6.1.0 pkgrel=1 @@ -10,10 +9,10 @@ arch=('any') license=('BSD') url="http://www.jcea.es/programacion/pybsddb.htm" makedepends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools" - "${MINGW_PACKAGE_PREFIX}-db") + "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python3-setuptools" + "${MINGW_PACKAGE_PREFIX}-python2-setuptools" + "${MINGW_PACKAGE_PREFIX}-db") options=('staticlibs' 'strip' '!debug') source=("http://pypi.python.org/packages/source/b/bsddb3/${_realname}-${pkgver}.tar.gz") md5sums=('8d998ee04dc05f3808a7edfe3011decc') @@ -23,14 +22,14 @@ prepare() { cd "${srcdir}/${_realname}-${pkgver}" sed -i -e "s|if os.name == 'posix':|if os.name == 'nt':|g" setup{2,3}.py sed -i -e "s|elif os.name == 'nt':|elif os.name == 'FOO':|g" setup{2,3}.py - + cd "${srcdir}" cp -r ${_realname}-${pkgver} build-${CARCH} } build() { CFLAGS+=" -DUNICODE -D_UNICODE" - + export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=YES export BERKELEYDB_DIR="${MINGW_PREFIX}" @@ -45,16 +44,16 @@ build() { package_python3-bsddb3() { depends=("${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-db") - + "${MINGW_PACKAGE_PREFIX}-db") + cd "${srcdir}/build-${CARCH}" ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build } package_python2-bsddb3() { depends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-db") - + "${MINGW_PACKAGE_PREFIX}-db") + cd "${srcdir}/build-${CARCH}" ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX#\/} --root="${pkgdir}" --optimize=1 --skip-build }