February 2014 - crux-commits

ports/opt (3.0): lua: 5.2.2 -> 5.2.3
by crux＠crux.nu 17 Feb '14

17 Feb '14

commit 5214f2f86fb9a5c4288d39722654c25b2fa94614 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Feb 17 13:03:38 2014 +1100 lua: 5.2.2 -> 5.2.3 diff --git a/lua/.footprint b/lua/.footprint index b3b2a71..da42274 100644 --- a/lua/.footprint +++ b/lua/.footprint @@ -10,8 +10,9 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/lualib.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/liblua.a -lrwxrwxrwx root/root usr/lib/liblua.so -> liblua.so.5.2 +-rw-r--r-- root/root usr/lib/liblua.so -rw-r--r-- root/root usr/lib/liblua.so.5.2 +-rw-r--r-- root/root usr/lib/liblua.so.5.2.3 drwxr-xr-x root/root usr/lib/lua/ drwxr-xr-x root/root usr/lib/lua/5.2/ drwxr-xr-x root/root usr/lib/pkgconfig/ diff --git a/lua/.md5sum b/lua/.md5sum index 95a69ae..8aead05 100644 --- a/lua/.md5sum +++ b/lua/.md5sum @@ -1,2 +1,3 @@ -efbb645e897eae37cad4344ce8b0a614 lua-5.2.2.tar.gz -51a278f9386afed2ffdd1edb841db3d5 lua.diff +bdc663c7b82ffc0b5df67611621fb625 liblua.so.patch +dc7f94ec6ff15c985d2d6ad0f1b35654 lua-5.2.3.tar.gz +e7ba6c2b695b0b84a5ea0cbff5fc9067 lua.pc diff --git a/lua/Pkgfile b/lua/Pkgfile index a731338..9be590f 100644 --- a/lua/Pkgfile +++ b/lua/Pkgfile @@ -5,20 +5,24 @@ # Depends on: readline name=lua -version=5.2.2 +version=5.2.3 release=1 source=(http://www.lua.org/ftp/$name-$version.tar.gz - $name.diff) + liblua.so.patch lua.pc) build() { cd $name-$version - patch -Np1 -i $SRC/$name.diff + patch -p 1 -i $SRC/liblua.so.patch export CFLAGS="$CFLAGS -fPIC" - make linux - make INSTALL_TOP=$PKG/usr install + make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux - make pc > lua.pc - install -D -m 0644 lua.pc $PKG/usr/lib/pkgconfig/lua.pc + make \ + TO_LIB='liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.3' \ + INSTALL_TOP=$PKG/usr install + + #make pc > lua.pc + sed "s/%VER%/${version%.*}/g;s/%REL%/$version/g" $SRC/lua.pc > lua.pc + install -m 0644 -D lua.pc $PKG/usr/lib/pkgconfig/lua.pc } diff --git a/lua/liblua.so.patch b/lua/liblua.so.patch new file mode 100644 index 0000000..92c1f3a --- /dev/null +++ b/lua/liblua.so.patch @@ -0,0 +1,57 @@ +diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile +--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h +--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 ++++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 +@@ -100,7 +100,7 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ +diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile +--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100 ++++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200 +@@ -29,6 +29,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/lua/lua.diff b/lua/lua.diff deleted file mode 100644 index c81dd04..0000000 --- a/lua/lua.diff +++ /dev/null @@ -1,98 +0,0 @@ -diff -aur lua-5.2.0.orig/Makefile lua-5.2.0/Makefile ---- lua-5.2.0.orig/Makefile 2011-11-16 00:38:12.000000000 +0100 -+++ lua-5.2.0/Makefile 2012-03-14 09:00:52.823998608 +0100 -@@ -10,7 +10,7 @@ - # so take care if INSTALL_TOP is not an absolute path. See the local target. - # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with - # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h. --INSTALL_TOP= /usr/local -+INSTALL_TOP= /usr - INSTALL_BIN= $(INSTALL_TOP)/bin - INSTALL_INC= $(INSTALL_TOP)/include - INSTALL_LIB= $(INSTALL_TOP)/lib -@@ -41,7 +41,7 @@ - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua.a liblua.so.5.2 - TO_MAN= lua.1 luac.1 - - # Lua version and release. -@@ -63,6 +63,7 @@ - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -+ ln -s liblua.so.5.2 $(INSTALL_LIB)/liblua.so - - uninstall: - cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) -@@ -103,10 +104,14 @@ - - # echo pkg-config data - pc: -- @echo "version=$R" - @echo "prefix=$(INSTALL_TOP)" - @echo "libdir=$(INSTALL_LIB)" - @echo "includedir=$(INSTALL_INC)" -+ @echo "Name: Lua" -+ @echo "Description: An Extensible Extension Language" -+ @echo "Version: $R" -+ @echo "Libs: -L$(INSTALL_LIB) -llua -lm" -+ @echo "Cflags: -I$(INSTALL_INC)" - - # list targets that do not create files (but not all makes understand .PHONY) - .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho -diff -aur lua-5.2.0.orig/src/Makefile lua-5.2.0/src/Makefile ---- lua-5.2.0.orig/src/Makefile 2011-09-19 14:45:14.000000000 +0200 -+++ lua-5.2.0/src/Makefile 2012-03-14 08:41:50.374000136 +0100 -@@ -7,7 +7,8 @@ - PLAT= none - - CC= gcc --CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) -+CFLAGS ?= -O2 -Wall -+CFLAGS += -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) - LIBS= -lm $(SYSLIBS) $(MYLIBS) - -@@ -29,6 +30,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +45,7 @@ - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -59,6 +61,10 @@ - $(AR) $@ $? - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -Wl,-soname,liblua.so -o $@.5.2 $? $(MYLDFLAGS) -+ ln -s $@.5.2 $@ -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -diff -aur lua-5.2.0.orig/src/luaconf.h lua-5.2.0/src/luaconf.h ---- lua-5.2.0.orig/src/luaconf.h 2011-12-06 17:58:36.000000000 +0100 -+++ lua-5.2.0/src/luaconf.h 2012-03-14 08:42:10.370999861 +0100 -@@ -100,7 +100,7 @@ - #else /* }{ */ - - #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR - #define LUA_PATH_DEFAULT \ diff --git a/lua/lua.pc b/lua/lua.pc new file mode 100644 index 0000000..bf7977b --- /dev/null +++ b/lua/lua.pc @@ -0,0 +1,20 @@ +V=%VER% +R=%REL% + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm +Cflags: -I${includedir}

1 0

ports/core (3.0): db: update to 5.3.28
by crux＠crux.nu 16 Feb '14

16 Feb '14

commit 0a8548f0c128cacf5c793a87e9b03a12ae760e9c Author: Juergen Daubert <jue(a)jue.li> Date: Sun Feb 16 10:36:20 2014 +0100 db: update to 5.3.28 diff --git a/db/.md5sum b/db/.md5sum index 97e2cc0..3448f36 100644 --- a/db/.md5sum +++ b/db/.md5sum @@ -1 +1 @@ -3fda0b004acdaa6fa350bfc41a3b95ca db-5.3.21.tar.gz +b99454564d5b4479750567031d66fe24 db-5.3.28.tar.gz diff --git a/db/Pkgfile b/db/Pkgfile index 0b90af8..2ab0b87 100644 --- a/db/Pkgfile +++ b/db/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=db -version=5.3.21 +version=5.3.28 release=1 source=(http://download.oracle.com/berkeley-db/$name-$version.tar.gz)

1 0

ports/opt (3.0): wine add README
by crux＠crux.nu 16 Feb '14

16 Feb '14

commit f9aec5cd7dccd9b6e8e4e714a31fbec92f6d636d Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Feb 16 18:59:48 2014 +1100 wine add README diff --git a/wine/README b/wine/README index 6db7403..421892b 100644 --- a/wine/README +++ b/wine/README @@ -1,25 +1,19 @@ -README for wine 0.9.1+ +Note that wine compiles twice for 32bit and 64bit use and as such +requires compat-32 ports tree to be enabled to work. +You could edit wine to only compile 64bit only but then you can +only run PE64 bit binaries. -REQUIREMENTS +You enable compat-32 by. -Wine requires compat-32 ports to be enabled, as wine builds for -32bit and 64bit. +mv /etc/ports/compat-32.rsync.inactive /etc/ports/compat-32.rsync +$EDITOR /etc/prt-get.conf -PRE-INSTALL +And add: +prtdir /usr/ports/compat-32 -POST-INSTALL +Also be sure to enable: -The command 'winecfg' is now used to alter your configuration -settings. If you still have a config file the settings will be -moved into the registry (acessed by 'regedit') and the config -file will not be parsed anymore. - - -PRECAUTION - -If you are having any problems, it is highly recommmended that -you clean out your WINEPREFIX directory (eg: /home/user/.wine/) -as old configuration data can cause problems. +runscripts yes

1 0

ports/xorg (3.0): xorg-glproto: updated to 1.4.17
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit 08c545c8b5648b060dacd3c0dc06fff7dc76ccb0 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sat Feb 15 22:38:05 2014 +0100 xorg-glproto: updated to 1.4.17 diff --git a/xorg-glproto/.md5sum b/xorg-glproto/.md5sum index 5908f10..f41d612 100644 --- a/xorg-glproto/.md5sum +++ b/xorg-glproto/.md5sum @@ -1 +1 @@ -3847963c1b88fd04a030b932b0aece07 glproto-1.4.16.tar.bz2 +5565f1b0facf4a59c2778229c1f70d10 glproto-1.4.17.tar.bz2 diff --git a/xorg-glproto/Pkgfile b/xorg-glproto/Pkgfile index 6ed4977..9e94058 100644 --- a/xorg-glproto/Pkgfile +++ b/xorg-glproto/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-util-macros name=xorg-glproto -version=1.4.16 +version=1.4.17 release=1 source=(http://xorg.freedesktop.org/releases/individual/proto/glproto-$vers…

1 0

ports/opt (3.0): php-mysql: update to 5.5.9
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit 420b6b76b113bce7b817e6798b087e2f89e69e0e Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 15 16:23:21 2014 +0100 php-mysql: update to 5.5.9 diff --git a/php-mysql/.md5sum b/php-mysql/.md5sum index 9c272ac..83fa9ff 100644 --- a/php-mysql/.md5sum +++ b/php-mysql/.md5sum @@ -1 +1 @@ -42fe814a3cbbf34b21a2c39f66ee0001 php-5.5.8.tar.bz2 +c4a348a07b52f6e177d8fdc75fe507b1 php-5.5.9.tar.bz2 diff --git a/php-mysql/Pkgfile b/php-mysql/Pkgfile index 8ccfb4d..756a25a 100644 --- a/php-mysql/Pkgfile +++ b/php-mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mysql name=php-mysql -version=5.5.8 +version=5.5.9 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

ports/opt (3.0): php-fpm: update to 5.5.9
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit 008bcb71e0d7ea20bb24f6bf85bcb584c388d20d Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 15 16:23:09 2014 +0100 php-fpm: update to 5.5.9 diff --git a/php-fpm/.md5sum b/php-fpm/.md5sum index 51258df..6fdd529 100644 --- a/php-fpm/.md5sum +++ b/php-fpm/.md5sum @@ -1,2 +1,2 @@ -42fe814a3cbbf34b21a2c39f66ee0001 php-5.5.8.tar.bz2 +c4a348a07b52f6e177d8fdc75fe507b1 php-5.5.9.tar.bz2 93be638b655e225b198d2a2ae69ca2fb php-fpm diff --git a/php-fpm/Pkgfile b/php-fpm/Pkgfile index 86f35ed..4e90414 100644 --- a/php-fpm/Pkgfile +++ b/php-fpm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xz libpcre libxml2 name=php-fpm -version=5.5.8 +version=5.5.9 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2 php-fpm)

1 0

ports/opt (3.0): php-fcgi: update to 5.5.9
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit 262ba1973fdd8d9258717901a2bf93692570ed8c Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 15 16:23:00 2014 +0100 php-fcgi: update to 5.5.9 diff --git a/php-fcgi/.md5sum b/php-fcgi/.md5sum index 2ab7c90..6f2f69e 100644 --- a/php-fcgi/.md5sum +++ b/php-fcgi/.md5sum @@ -1,2 +1,2 @@ -42fe814a3cbbf34b21a2c39f66ee0001 php-5.5.8.tar.bz2 +c4a348a07b52f6e177d8fdc75fe507b1 php-5.5.9.tar.bz2 6297748058441ee6c6b88e429ee54ba1 php-fcgi diff --git a/php-fcgi/Pkgfile b/php-fcgi/Pkgfile index b3a3bbe..ce55c36 100644 --- a/php-fcgi/Pkgfile +++ b/php-fcgi/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xz libpcre libxml2 name=php-fcgi -version=5.5.8 +version=5.5.9 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2 php-fcgi)

1 0

ports/opt (3.0): php: update to 5.5.9
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit 68e488acdfe2d822b830f0577d1f9491ab963020 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 15 16:22:47 2014 +0100 php: update to 5.5.9 diff --git a/php/.md5sum b/php/.md5sum index 9c272ac..83fa9ff 100644 --- a/php/.md5sum +++ b/php/.md5sum @@ -1 +1 @@ -42fe814a3cbbf34b21a2c39f66ee0001 php-5.5.8.tar.bz2 +c4a348a07b52f6e177d8fdc75fe507b1 php-5.5.9.tar.bz2 diff --git a/php/Pkgfile b/php/Pkgfile index 11821a5..c0de86d 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: readline libpcre libxml2 curl db gdbm xz name=php -version=5.5.8 +version=5.5.9 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

ports/opt (3.0): php-sqlite3: update to 5.5.9
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit a151a19c09bef8c8c5772f92f66dcee4dfc52bb5 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 15 16:23:34 2014 +0100 php-sqlite3: update to 5.5.9 diff --git a/php-sqlite3/.md5sum b/php-sqlite3/.md5sum index 9c272ac..83fa9ff 100644 --- a/php-sqlite3/.md5sum +++ b/php-sqlite3/.md5sum @@ -1 +1 @@ -42fe814a3cbbf34b21a2c39f66ee0001 php-5.5.8.tar.bz2 +c4a348a07b52f6e177d8fdc75fe507b1 php-5.5.9.tar.bz2 diff --git a/php-sqlite3/Pkgfile b/php-sqlite3/Pkgfile index e3ebac8..3253664 100644 --- a/php-sqlite3/Pkgfile +++ b/php-sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: sqlite3 name=php-sqlite3 -version=5.5.8 +version=5.5.9 release=1 source=(http://www.php.net/distributions/php-$version.tar.bz2)

1 0

ports/opt (3.0): adobereader: updated to 9.5.5 and fixed deps
by crux＠crux.nu 15 Feb '14

15 Feb '14

commit 86236358420776296dde7fbadd410e569a65d09c Author: Jose V Beneyto <sepen(a)crux.nu> Date: Sat Feb 15 12:05:51 2014 +0100 adobereader: updated to 9.5.5 and fixed deps diff --git a/adobereader/.md5sum b/adobereader/.md5sum index 8d4c82e..25c15dd 100644 --- a/adobereader/.md5sum +++ b/adobereader/.md5sum @@ -1 +1 @@ -9fd583a6ebf000cae507f128a58e79b5 AdbeRdr9.5.4-1_i486linux_enu.tar.bz2 +664d546fbf0ad91f20dcf3753b0a2684 AdbeRdr9.5.5-1_i486linux_enu.tar.bz2 diff --git a/adobereader/Pkgfile b/adobereader/Pkgfile index 7041549..e261cb4 100644 --- a/adobereader/Pkgfile +++ b/adobereader/Pkgfile @@ -2,10 +2,10 @@ # URL: http://www.adobe.com/ # Maintainer: Jose V Beneyto, sepen at crux dot nu # Packager: Markus Ackermann, maol at symlink dot ch -# Depends on: gtk +# Depends on: gtk-32 name=adobereader -version=9.5.4 +version=9.5.5 release=1 source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr$…

1 0