diff --git a/common/global-defs.sh b/common/global-defs.sh index ca4d457e8d6..fcda9830d22 100644 --- a/common/global-defs.sh +++ b/common/global-defs.sh @@ -11,7 +11,7 @@ # increased to "reproduce" the build behaviour (somewhat :-). # xbps-src version. -XBPS_SRC_REQ=75 +XBPS_SRC_REQ=83 # XBPS utils version. XBPS_UTILS_REQ=0.26.1 diff --git a/common/shlibs b/common/shlibs index df79483a545..e8c9d975173 100644 --- a/common/shlibs +++ b/common/shlibs @@ -868,7 +868,7 @@ libsord-0.so.0 libsord-0.5.0_1 libgiggle.so.0 libgiggle-0.6.1_1 libgiggle-git.so.0 libgiggle-0.6.1_1 libwine.so.1 libwine-1.6_1 -libwv-1.2.so.3 libwv-1.2.4_1 +libwv-1.2.so.4 libwv-1.2.9_1 libabiword-3.0.so libabiword-3.0.0_1 libmpg123.so.0 libmpg123-1.13.4_2_1 libopenal.so.1 libopenal-1.13_1 @@ -964,7 +964,7 @@ libparserutils.so.0 libparserutils-0.1.1_1 libwapcaplet.so.0 libwapcaplet-0.1.0_1 libcss.so.0 libcss-0.1.1_1 libhubbub.so.0 libhubbub-0.1.1_1 -liblutok.so.2 lutok-0.3_1 +liblutok.so.3 lutok-0.4_1 libmtdev.so.1 mtdev-1.1.2_1 libcryptsetup.so.4 libcryptsetup-1.4.1_1 libgusb.so.2 libgusb-0.1.3_1 diff --git a/srcpkgs/abiword-plugins b/srcpkgs/abiword-plugins deleted file mode 120000 index 21119f1349b..00000000000 --- a/srcpkgs/abiword-plugins +++ /dev/null @@ -1 +0,0 @@ -abiword \ No newline at end of file diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template index 027dfc343cf..d7988bd1c64 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -1,13 +1,13 @@ # Template file for 'abiword' pkgname=abiword version=3.0.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-plugins --enable-clipart --enable-templates" hostmakedepends="automake libtool flex pkg-config" makedepends="libjpeg-turbo-devel libpng-devel>=1.6 fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel - wv-devel boost-devel libxslt-devel libwmf-devel libchamplain-devel + wv-devel>=1.2.9 boost-devel libxslt-devel libwmf-devel libchamplain-devel redland-devel libical-devel" short_desc="Free word processing program similar to Microsoft(R) Word" maintainer="davehome " @@ -16,8 +16,6 @@ homepage="http://www.abisource.com/" distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz" checksum=d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 -CPPFLAGS="-I/usr/include/boost" - libabiword_package() { short_desc+=" - Runtime library" pkg_install() { @@ -25,17 +23,10 @@ libabiword_package() { } } -abiword-plugins_package() { - short_desc+=" - Plugins" - pkg_install() { - vmove usr/lib/abiword-3.0/plugins - } -} - abiword-devel_package() { depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk-devel - librsvg-devel libabiword>=${version}" - short_desc+=" - Development files" + librsvg-devel libabiword>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -43,6 +34,7 @@ abiword-devel_package() { } abiword_package() { + replaces="abiword-plugins>=0" depends="hicolor-icon-theme desktop-file-utils" pkg_install() { vmove all diff --git a/srcpkgs/base-system-busybox/files/dotconfig b/srcpkgs/base-system-busybox/files/dotconfig index 6dd7e565a55..1be217fb9b8 100644 --- a/srcpkgs/base-system-busybox/files/dotconfig +++ b/srcpkgs/base-system-busybox/files/dotconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Thu Aug 30 08:07:02 2012 +# Busybox version: 1.21.1 +# Sun Dec 8 12:43:34 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/run" CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y @@ -54,8 +55,8 @@ CONFIG_FEATURE_HAVE_RPC=y # # Build Options # -# CONFIG_STATIC is not set -CONFIG_PIE=y +CONFIG_STATIC=y +# CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set @@ -81,10 +82,10 @@ CONFIG_NO_DEBUG_LIB=y # Installation Options ("make install" behavior) # # CONFIG_INSTALL_APPLET_SYMLINKS is not set -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS=y +CONFIG_INSTALL_APPLET_HARDLINKS=y +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set # CONFIG_INSTALL_APPLET_DONT is not set -CONFIG_INSTALL_SH_APPLET_SYMLINK=y +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set CONFIG_PREFIX="./_install" @@ -96,6 +97,7 @@ CONFIG_FEATURE_SYSTEMD=y CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y CONFIG_FEATURE_ETC_NETWORKS=y CONFIG_FEATURE_USE_TERMIOS=y @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -319,14 +322,14 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # CONFIG_CHVT is not set # CONFIG_FGCONSOLE is not set -CONFIG_CLEAR=y +# CONFIG_CLEAR is not set # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set # CONFIG_KBD_MODE is not set # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set # CONFIG_OPENVT is not set -CONFIG_RESET=y +# CONFIG_RESET is not set CONFIG_RESIZE=y CONFIG_FEATURE_RESIZE_PRINT=y # CONFIG_SETCONSOLE is not set @@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y @@ -464,7 +466,7 @@ CONFIG_LAST_SYSTEM_ID=0 CONFIG_GETTY=y CONFIG_LOGIN=y CONFIG_LOGIN_SESSION_AS_CHILD=y -CONFIG_PAM=y +# CONFIG_PAM is not set CONFIG_LOGIN_SCRIPTS=y CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y @@ -612,9 +614,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_HFS=y CONFIG_FEATURE_VOLUMEID_JFS=y CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_UDF=y @@ -622,6 +626,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y @@ -752,19 +757,19 @@ CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y -CONFIG_HTTPD=y -CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_USE_SENDFILE=y -CONFIG_FEATURE_HTTPD_SETUID=y -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_FEATURE_HTTPD_ERROR_PAGES=y -CONFIG_FEATURE_HTTPD_PROXY=y -CONFIG_FEATURE_HTTPD_GZIP=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -894,6 +899,13 @@ CONFIG_POWERTOP=y CONFIG_PSTREE=y CONFIG_PWDX=y CONFIG_SMEMCAP=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FREE=y @@ -914,13 +926,6 @@ CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_SMP_CPU=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOP_SMP_PROCESS=y -CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y CONFIG_WATCH=y @@ -1015,6 +1020,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set CONFIG_LOGGER=y diff --git a/srcpkgs/base-system-busybox/files/udhcpc@.service b/srcpkgs/base-system-busybox/files/udhcpc@.service deleted file mode 100644 index 1493129e91d..00000000000 --- a/srcpkgs/base-system-busybox/files/udhcpc@.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Micro DHCP client on %I -Wants=network.target -Before=network.target - -[Service] -ExecStart=/sbin/udhcpc -t 10 -p /var/run/udhcpc-%I.pid -R -f -n -i %I - -[Install] -Alias=multi-user.target.wants/udhcpc@eth0.service diff --git a/srcpkgs/base-system-busybox/patches/glibc-2.16.patch b/srcpkgs/base-system-busybox/patches/glibc-2.16.patch deleted file mode 100644 index ee490305ae9..00000000000 --- a/srcpkgs/base-system-busybox/patches/glibc-2.16.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/libbb.h.orig 2012-07-09 15:18:29.296170184 +0200 -+++ include/libbb.h 2012-07-09 15:18:41.374877927 +0200 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/srcpkgs/base-system-busybox/patches/mount_strictatime.patch b/srcpkgs/base-system-busybox/patches/mount_strictatime.patch deleted file mode 100644 index b530ac832e2..00000000000 --- a/srcpkgs/base-system-busybox/patches/mount_strictatime.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add support for strictatime mount option. - -https://bugs.busybox.net/show_bug.cgi?id=5474 - ---- util-linux/mount.c.orig 2012-08-29 16:30:19.164282575 +0200 -+++ util-linux/mount.c 2012-08-29 16:30:03.088660739 +0200 -@@ -235,6 +235,7 @@ static const int32_t mount_options[] = { - /* "noatime" */ MS_NOATIME, - /* "diratime" */ ~MS_NODIRATIME, - /* "nodiratime" */ MS_NODIRATIME, -+ /* "strictatime" */ MS_STRICTATIME, - /* "mand" */ MS_MANDLOCK, - /* "nomand" */ ~MS_MANDLOCK, - /* "relatime" */ MS_RELATIME, -@@ -291,6 +292,7 @@ static const char mount_option_str[] = - "noatime\0" - "diratime\0" - "nodiratime\0" -+ "strictatime\0" - "mand\0" - "nomand\0" - "relatime\0" diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index f0a5f5d1976..d2a6cf676fe 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -1,55 +1,50 @@ -# Build template for 'base-system-live-busybox'. +# Build template for 'base-system-busybox'. pkgname=base-system-busybox -version=1.20.2 -revision=4 +version=1.21.1 +revision=2 wrksrc="busybox-${version}" homepage="http://www.busybox.net" -makedepends="perl pam-devel" -short_desc="The Swiss Army Knife of Embedded Linux - for base-system-live" +makedepends="perl" +short_desc="The Swiss Army Knife of Embedded Linux - base-system replacements" maintainer="Juan RP " license="GPL-2" distfiles="${homepage}/downloads/busybox-$version.tar.bz2" -checksum=eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 -long_desc=" - BusyBox combines tiny versions of many common UNIX utilities into a single - small executable. It provides replacements for most of the utilities you - usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox - generally have fewer options than their full-featured GNU cousins; however, - the options that are included provide the expected functionality and behave - very much like their GNU counterparts. BusyBox provides a fairly complete - environment for any small or embedded system. - - This package is only meant to be installed by void-mklive utility and shall - not be installed into a running system." +checksum=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 do_build() { cp -f ${FILESDIR}/dotconfig .config + if [ "$CROSS_BUILD" ]; then + sed -e "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" -i .config + fi make ${makejobs} } do_install() { - make CONFIG_PREFIX=${DESTDIR} install - + # Install everything to /usr/bin. vmkdir usr/bin - vmkdir usr/sbin - vmove "bin/*" usr/bin - vmove "sbin/*" usr/sbin - - chmod 4755 ${DESTDIR}/usr/bin/busybox - - vinstall ${FILESDIR}/udhcpc@.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/udhcpc-default.script 755 usr/share/udhcpc default.script + for f in bin sbin usr/sbin; do + ln -sfr ${DESTDIR}/usr/bin ${DESTDIR}/${f} + done + make CONFIG_PREFIX=${DESTDIR} install + vinstall ${FILESDIR}/udhcpc-default.script \ + 755 usr/share/udhcpc default.script + rm -f ${DESTDIR}/{bin,sbin,usr/sbin} } base-system-busybox_package() { - replaces="base-busybox>=0 base-system-live-busybox>=0" - provides="coreutils-1.20.2 util-linux-1.20.2 run-parts-1.20.2 - dosfstools-1.20.2 grep-1.20.2 findutils-1.20.2 sed-1.20.2 - procps-1.20.2" - conflicts="base-system>=0 run-parts>=0 coreutils>=0 util-linux>=0 - dosfstools>=0 grep>=0 findutils>=0 sed>=0 procps>=0" + # Applets provided by this busybox version. + # Keep this list updated with ${FILESDIR}/dotconfig. + # + # XXX bzip2 provides libbz2, split it into libbz2 pkg. + FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk + grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi + patch powertop procps-ng psmisc rfkill run-parts sed tar + traceroute util-linux wget which whois xz" + for f in ${FEATURES}; do + provides+="${f}-${version}_${revision} " + replaces+="${f}>=0 " + done pkg_install() { - vmove etc - vmove usr + vmove all } } diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 15c4ad7294d..0510c691614 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=034 -revision=1 +revision=2 hostmakedepends="libxslt docbook-xsl asciidoc" makedepends="psmisc cpio xz systemd" homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" @@ -39,7 +39,7 @@ dracut-network_package() { } dracut_package() { - depends="psmisc>=22.14_2 cpio xz systemd>=206" + depends="${makedepends}" conf_files="/etc/dracut.conf" make_dirs=" /etc/dracut.conf.d 0755 root root diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 95e87f18e27..8adb01b125f 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.10.2 +version=3.10.3 revision=1 build_style=gnu-configure configure_args="--with-openldap --disable-uoa @@ -15,12 +15,12 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=0f384d18811515e2e73d6e8683a440559cef495637b94fecfb10e6ff0283ecb9 +checksum=41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2 evolution-data-server-devel_package() { depends="sqlite-devel mit-krb5-devel nss-devel libical-devel libldap-devel libgdata-devel>=0.14 libsecret-devel - ${sourcepkg}-${version}_${revision}" + ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 69ebea482a7..1a8497a3d6a 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.10.2 +version=3.10.3 revision=1 build_style=gnu-configure configure_args="--disable-pst-import --with-openldap --disable-bogofilter @@ -8,7 +8,8 @@ configure_args="--disable-pst-import --with-openldap --disable-bogofilter --disable-text-highlight" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" -makedepends="libgdata-devel>=0.14 webkitgtk-devel>=2.1 evolution-data-server-devel>=3.10 +makedepends=" + libgdata-devel>=0.14 webkitgtk-devel>=2.1 evolution-data-server-devel>=3.10 GConf-devel clutter-gtk-devel>=1.4.4_2 libcanberra-devel gtkhtml-devel>=4.6.0 libsoup-gnome-devel>=2.44 gnome-desktop-devel>=3.10 libnotify-devel gstreamer1-devel>=1:1.2 libgweather-devel>=3.10 @@ -18,7 +19,7 @@ maintainer="davehome " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=39d228460b0f6701d9786ebd98d8ed4d87ecf8a73c12e00d41f7b107d27b7c47 +checksum=ad4b37215c361134a14aa1598d5c038327f897b7d9dbc750cab3d58d5c922f4c post_install() { # Remove devel stuff, not interested. diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index 0f9d17526c2..a2d04b100fb 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -1,6 +1,6 @@ # Template build file 'freetype'. pkgname=freetype -version=2.5.1 +version=2.5.2 revision=1 build_style=gnu-configure hostmakedepends="pkg-config which" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.freetype.org/" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45 +checksum=4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def do_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/git-python b/srcpkgs/git-python deleted file mode 120000 index 0899c2993da..00000000000 --- a/srcpkgs/git-python +++ /dev/null @@ -1 +0,0 @@ -git \ No newline at end of file diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 3b2892fedc7..6467080d977 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,19 +1,19 @@ # Template build file for "git". pkgname=git -version=1.8.4.3 +version=1.8.5.1 revision=1 build_style=gnu-configure configure_args="--with-curl --with-expat --without-tcltk ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" make_install_args="NO_INSTALL_HARDLINKS=1" -hostmakedepends="xmlto>=0.0.25_2 asciidoc perl" -makedepends="openssl-devel libcurl-devel expat-devel python-devel" +hostmakedepends="xmlto>=0.0.25_2 asciidoc perl python" +makedepends="openssl-devel libcurl-devel expat-devel" short_desc="GIT Tree History Storage Tool" maintainer="Juan RP " homepage="http://git-scm.com/" license="GPL-2" distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" -checksum=0a78fa71465e58e07d003dc5a575b606fe02b5e7cd5b509d83a44926606fcb21 +checksum=1559c4d7af0377ea3133c6dfccc2f32a25bcc8e3255464f4a36ab87416f8ee44 post_build() { make ${makejobs} -C Documentation man @@ -35,16 +35,6 @@ git-docs_package() { } } -git-python_package() { - noarch=yes - pycompile_module="git_remote_helpers" - depends="git python" - short_desc+=" - python bindings" - pkg_install() { - vmove "usr/lib/python*" - } -} - git-perl_package() { noarch=yes depends="git perl" diff --git a/srcpkgs/gpart/template b/srcpkgs/gpart/template new file mode 100644 index 00000000000..8d8b5b10e47 --- /dev/null +++ b/srcpkgs/gpart/template @@ -0,0 +1,18 @@ +# Template file for 'gpart' +pkgname=gpart +version=0.2.1 +revision=1 +build_style=gnu-configure +configure_args="ac_cv_func_malloc_0_nonnull=yes" +short_desc="Partition table rescue/guessing tool" +maintainer="Juan RP " +license="GPL-2" +homepage="https://github.com/baruch/gpart" +distfiles="https://github.com/baruch/gpart/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=4efdaf4a557bf1b3fb3379bf684772dc1c0a05c9251eec53299b9f2362ea4e50 + +gpart_package() { + pkg_install() { + vmove all + } +} diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 0e9fc0a7339..d11ad89ca92 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,7 +1,7 @@ # Template build file for 'gtk+3'. pkgname=gtk+3 -version=3.10.5 -revision=1 +version=3.10.6 +revision=2 wrksrc="gtk+-${version}" build_style=gnu-configure configure_args="--enable-cups --disable-schemas-compile --enable-gtk2-dependency --enable-colord" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="LGPL-2.1" distfiles="${GNOME_SITE}/gtk+/3.10/gtk+-${version}.tar.xz" -checksum=3191f6d8e8cdf0bac1a8ed6388acc67a15acf5e276161c9b93a305938d29ccc7 +checksum=3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a hostmakedepends="pkg-config glib-devel>=2.38" makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-atk-devel>=2.8 @@ -55,6 +55,11 @@ else configure_args+=" --disable-x11-backend" fi +pre_configure() { + # protocols too new; made with a wayland from git, not 1.3.0 + rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c} +} + post_install() { rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1 # Provide a default (icon)theme. @@ -63,7 +68,7 @@ post_install() { gtk+3-devel_package() { depends="libglib-devel>=2.38 atk-devel>=2.10 cairo-devel gdk-pixbuf-devel>=2.30 - pango-devel>=1.36 at-spi2-atk-devel>=2.10 gtk+3-${version}_${revision}" + pango-devel>=1.36 at-spi2-atk-devel>=2.10 gtk+3>=${version}_${revision}" if [ "$build_option_x11" ]; then depends+=" libXcomposite-devel libXcursor-devel libXrandr-devel libXi-devel libXinerama-devel" fi diff --git a/srcpkgs/gvfs-afp b/srcpkgs/gvfs-afp new file mode 120000 index 00000000000..fcee85889f6 --- /dev/null +++ b/srcpkgs/gvfs-afp @@ -0,0 +1 @@ +gvfs \ No newline at end of file diff --git a/srcpkgs/gvfs-cdda b/srcpkgs/gvfs-cdda new file mode 120000 index 00000000000..fcee85889f6 --- /dev/null +++ b/srcpkgs/gvfs-cdda @@ -0,0 +1 @@ +gvfs \ No newline at end of file diff --git a/srcpkgs/gvfs-goa b/srcpkgs/gvfs-goa new file mode 120000 index 00000000000..fcee85889f6 --- /dev/null +++ b/srcpkgs/gvfs-goa @@ -0,0 +1 @@ +gvfs \ No newline at end of file diff --git a/srcpkgs/gvfs-gphoto2 b/srcpkgs/gvfs-gphoto2 new file mode 120000 index 00000000000..fcee85889f6 --- /dev/null +++ b/srcpkgs/gvfs-gphoto2 @@ -0,0 +1 @@ +gvfs \ No newline at end of file diff --git a/srcpkgs/gvfs-mtp b/srcpkgs/gvfs-mtp new file mode 120000 index 00000000000..fcee85889f6 --- /dev/null +++ b/srcpkgs/gvfs-mtp @@ -0,0 +1 @@ +gvfs \ No newline at end of file diff --git a/srcpkgs/gvfs-smb b/srcpkgs/gvfs-smb new file mode 120000 index 00000000000..fcee85889f6 --- /dev/null +++ b/srcpkgs/gvfs-smb @@ -0,0 +1 @@ +gvfs \ No newline at end of file diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index c679485da6f..c2bb757d174 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,13 +1,13 @@ # Template file for 'gvfs' pkgname=gvfs version=1.18.3 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-hal --disable-afc +configure_args="--disable-hal --disable-afc --disable-obexftp --with-bash-completion-dir=/usr/share/bash-completion/completions" -hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" -makedepends="libbluetooth-devel dbus-glib-devel - libopenobex-devel libgudev-devel>=183 libexif-devel libbluray-devel +hostmakedepends="pkg-config intltool libxslt docbook-xsl" +makedepends=" + libbluetooth-devel dbus-glib-devel libgudev-devel>=183 libexif-devel libbluray-devel fuse-devel libarchive-devel>=3.1.2 libcdio-devel libsoup-gnome-devel>=2.44 libgphoto2-devel libsecret-devel gtk+3-devel samba-devel systemd-devel avahi-glib-libs-devel udisks2-devel libgcrypt-devel libmtp-devel @@ -30,6 +30,76 @@ gvfs-devel_package() { } } +gvfs-afp_package() { + short_desc+=" - Apple Filing Protocol (AFP) backend" + depends="gvfs>=${version}_${revision}" + replaces="gvfs<1.18.3_2" + pkg_install() { + vmove "usr/libexec/gvfsd-afp*" + vmove "usr/share/gvfs/mounts/afp*" + } +} + +gvfs-cdda_package() { + short_desc+=" - CD-ROM backend" + depends="gvfs>=${version}_${revision}" + replaces="gvfs<1.18.3_2" + pkg_install() { + vmove "usr/libexec/gvfsd-cd*" + vmove "usr/share/gvfs/mounts/cd*" + } +} + +gvfs-goa_package() { + short_desc+=" - Gnome Online Accounts (webservices) backend" + depends="gvfs>=${version}_${revision}" + replaces="gvfs<1.18.3_2" + pkg_install() { + vmove usr/libexec/gvfs-goa-volume-monitor + vmove usr/share/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service + vmove usr/share/gvfs/remote-volume-monitors/goa.monitor + } +} + +gvfs-gphoto2_package() { + short_desc+=" - gphoto2 (PTP camera/MTP media player) backend" + depends="gvfs>=${version}_${revision}" + replaces="gvfs<1.18.3_2" + pkg_install() { + vmove usr/libexec/gvfs-gphoto2-volume-monitor + vmove usr/libexec/gvfsd-gphoto2 + vmove usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service + vmove usr/share/gvfs/remote-volume-monitors/gphoto2.monitor + } +} + +gvfs-mtp_package() { + short_desc+=" - MTP backend" + depends="gvfs>=${version}_${revision}" + replaces="gvfs<1.18.3_2" + pkg_install() { + vmove usr/libexec/gvfs-mtp-volume-monitor + vmove usr/libexec/gvfsd-mtp + vmove usr/share/dbus-1/services/org.gtk.Private.MTPVolumeMonitor.service + vmove usr/share/gvfs/remote-volume-monitors/mtp.monitor + vmove usr/share/gvfs/mounts/mtp.mount + } +} + +gvfs-smb_package() { + short_desc+=" - SMB/CIFS (Windows client) backend" + depends="gvfs>=${version}_${revision}" + replaces="gvfs<1.18.3_2" + pkg_install() { + vmove usr/libexec/gvfsd-smb + vmove usr/libexec/gvfsd-smb-browse + vmove usr/share/GConf/gsettings/gvfs-smb.convert + vmove usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + vmove usr/share/gvfs/mounts/smb-browse.mount + vmove usr/share/gvfs/mounts/smb.mount + } +} + gvfs_package() { pkg_install() { vmove all diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index 95dc975a863..dfccab004ea 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -1,6 +1,6 @@ # Template build file for 'harfbuzz'. pkgname=harfbuzz -version=0.9.23 +version=0.9.24 revision=1 build_style=gnu-configure configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.pango.org/" license="LGPL-2.1" distfiles="http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${version}.tar.bz2" -checksum=171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7 +checksum=edf25dd8a318acdeacd2aeade2387db23c109fec0da626f2127f43917a372422 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libtool glib-devel" @@ -34,6 +34,7 @@ harfbuzz-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" + vmove usr/share/gtk-doc } } diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template index c9639a84236..9ea62a2037a 100644 --- a/srcpkgs/i3/template +++ b/srcpkgs/i3/template @@ -1,7 +1,8 @@ # Template file for 'i3' pkgname=i3 version=4.6 -revision=1 +revision=2 +build_style=gnu-makefile short_desc="Improved tiling window manager" maintainer="davehome " license="BSD" @@ -19,13 +20,11 @@ makedepends="pcre-devel>=8.30 yajl-devel libxcb-devel libev-devel libXcursor-devel pango-devel startup-notification-devel>=0.12_3 xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9" -do_build() { - make CC="$CC" LD="$LD" CFLAGS="$CFLAGS" ${makejobs} +post_build() { make ${makejobs} -C man } -do_install() { - make DESTDIR=${DESTDIR} install +post_install() { vmkdir usr/share/man/man1 install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1 } @@ -38,7 +37,6 @@ i3-devel_package() { } i3_package() { - depends="i3status rxvt-unicode dmenu" conf_files="/etc/i3/config /etc/i3/config.keycodes" pkg_install() { vmove all diff --git a/srcpkgs/kyua-cli/template b/srcpkgs/kyua-cli/template index eca5c47339e..f4f98472ef5 100644 --- a/srcpkgs/kyua-cli/template +++ b/srcpkgs/kyua-cli/template @@ -1,6 +1,6 @@ # Template file for 'kyua-cli' pkgname=kyua-cli -version=0.7 +version=0.8 revision=1 build_style=gnu-configure configure_args=" @@ -9,13 +9,13 @@ configure_args=" kyua_cv_signals_lastno=31 kyua_cv_getcwd_null_0_works=yes ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount" hostmakedepends="pkg-config automake libtool atf-devel doxygen" -makedepends="atf-devel>=0.16 lutok-devel>=0.3 sqlite-devel kyua-testers" +makedepends="atf-devel>=0.16 lutok-devel>=0.4 sqlite-devel kyua-testers" short_desc="Kyua (automated testing framework) - Command line interface" maintainer="Juan RP " license="Modified BSD" homepage="http://code.google.com/p/kyua" distfiles="https://kyua.googlecode.com/files/${pkgname}-${version}.tar.gz" -checksum=0f14b4bc6368da247e7e97f693bdffb1a5bc5c09027d25a45c9ff749bbe67558 +checksum=28f90929e4b73959bdd08a1d3f5ce7e77e0e4fc9978d10b1b079160428d770b3 long_desc=" Kyua (pronounced Q.A.) is a testing framework for both developers and users. Kyua is different from most other testing frameworks in that it puts the end diff --git a/srcpkgs/kyua-testers/patches/0001-Cache-configure-results-for-custom-tests.patch b/srcpkgs/kyua-testers/patches/0001-Cache-configure-results-for-custom-tests.patch deleted file mode 100644 index e4f36117974..00000000000 --- a/srcpkgs/kyua-testers/patches/0001-Cache-configure-results-for-custom-tests.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 97d47392460ad5c820f0b316a7012104b5cd6168 Mon Sep 17 00:00:00 2001 -From: Julio Merino -Date: Tue, 12 Mar 2013 16:07:26 -0400 -Subject: [PATCH 1/4] Cache configure results for custom tests - -Add caching of the results of most of our custom tests -- particularly -to those that need to execute a test program to determine the outcome -of the result. - -This is to aid cross-build environments to pass the expected result of -these configure tests, as they cannot execute the tests themselves. ---- - m4/compiler-features.m4 | 77 +++++++++++++++++++++++++++++-------------------- - m4/fs.m4 | 24 +++++++-------- - m4/getopt.m4 | 55 ++++++++++++++++++++--------------- - m4/signals.m4 | 26 ++++++++--------- - 4 files changed, 102 insertions(+), 80 deletions(-) - -diff --git a/m4/compiler-features.m4 b/m4/compiler-features.m4 -index 1e1980d..6ed3de9 100644 ---- m4/compiler-features.m4 -+++ m4/compiler-features.m4 -@@ -35,13 +35,13 @@ dnl does not allow it. - dnl - AC_DEFUN([KYUA_REQUIRE_CXX], [ - AC_CACHE_CHECK([whether the C++ compiler works], -- [atf_cv_prog_cxx_works], -+ [kyua_cv_prog_cxx_works], - [AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], -- [atf_cv_prog_cxx_works=yes], -- [atf_cv_prog_cxx_works=no]) -+ [kyua_cv_prog_cxx_works=yes], -+ [kyua_cv_prog_cxx_works=no]) - AC_LANG_POP([C++])]) -- if test "${atf_cv_prog_cxx_works}" = no; then -+ if test "${kyua_cv_prog_cxx_works}" = no; then - AC_MSG_ERROR([C++ compiler cannot create executables]) - fi - ]) -@@ -96,20 +96,25 @@ AC_DEFUN([KYUA_ATTRIBUTE_NORETURN], [ - dnl Sun's cc does support the noreturn attribute but CC (the C++ - dnl compiler) does not. And in that case, CC just raises a warning - dnl during compilation, not an error. -- AC_MSG_CHECKING(whether __attribute__((noreturn)) is supported) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([], [ -+ AC_CACHE_CHECK( -+ [whether __attribute__((noreturn)) is supported], -+ [kyua_cv_attribute_noreturn], [ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([], [ - #if ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2) - return 0; - #else - return 1; - #endif -- ])], -- [AC_MSG_RESULT(yes) -- value="__attribute__((noreturn))"], -- [AC_MSG_RESULT(no) -- value=""] -- ) -- AC_SUBST([ATTRIBUTE_NORETURN], [${value}]) -+ ])], -+ [kyua_cv_attribute_noreturn=yes], -+ [kyua_cv_attribute_noreturn=no]) -+ ]) -+ if test "${kyua_cv_attribute_noreturn}" = yes; then -+ attribute_value="__attribute__((noreturn))" -+ else -+ attribute_value="" -+ fi -+ AC_SUBST([ATTRIBUTE_NORETURN], [${attribute_value}]) - ]) - - -@@ -119,9 +124,11 @@ dnl - dnl Checks if the current compiler has a way to mark functions as pure. - dnl - AC_DEFUN([KYUA_ATTRIBUTE_PURE], [ -- AC_MSG_CHECKING(whether __attribute__((__pure__)) is supported) -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([ -+ AC_CACHE_CHECK( -+ [whether __attribute__((__pure__)) is supported], -+ [kyua_cv_attribute_pure], [ -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([ - static int function(int, int) __attribute__((__pure__)); - - static int -@@ -131,12 +138,15 @@ function(int a, int b) - }], [ - return function(3, 4); - ])], -- [AC_MSG_RESULT(yes) -- value="__attribute__((__pure__))"], -- [AC_MSG_RESULT(no) -- value=""] -- ) -- AC_SUBST([ATTRIBUTE_PURE], [${value}]) -+ [kyua_cv_attribute_pure=yes], -+ [kyua_cv_attribute_pure=no]) -+ ]) -+ if test "${kyua_cv_attribute_pure}" = yes; then -+ attribute_value="__attribute__((__pure__))" -+ else -+ attribute_value="" -+ fi -+ AC_SUBST([ATTRIBUTE_PURE], [${attribute_value}]) - ]) - - -@@ -147,9 +157,11 @@ dnl Checks if the current compiler has a way to mark parameters as unused - dnl so that the -Wunused-parameter warning can be avoided. - dnl - AC_DEFUN([KYUA_ATTRIBUTE_UNUSED], [ -- AC_MSG_CHECKING(whether __attribute__((__unused__)) is supported) -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([ -+ AC_CACHE_CHECK( -+ [whether __attribute__((__unused__)) is supported], -+ [kyua_cv_attribute_unused], [ -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([ - static void - function(int a __attribute__((__unused__))) - { -@@ -157,10 +169,13 @@ function(int a __attribute__((__unused__))) - function(3); - return 0; - ])], -- [AC_MSG_RESULT(yes) -- value="__attribute__((__unused__))"], -- [AC_MSG_RESULT(no) -- value=""] -- ) -- AC_SUBST([ATTRIBUTE_UNUSED], [${value}]) -+ [kyua_cv_attribute_unused=yes], -+ [kyua_cv_attribute_unused=no]) -+ ]) -+ if test "${kyua_cv_attribute_unused}" = yes; then -+ attribute_value="__attribute__((__unused__))" -+ else -+ attribute_value="" -+ fi -+ AC_SUBST([ATTRIBUTE_UNUSED], [${attribute_value}]) - ]) -diff --git a/m4/fs.m4 b/m4/fs.m4 -index 94b42f0..e4a27e8 100644 ---- m4/fs.m4 -+++ m4/fs.m4 -@@ -43,9 +43,10 @@ dnl nice to detect if lchmod(3) works at run time to prevent side-effects of - dnl this test but doing so means we will keep receiving a noisy compiler - dnl warning. - AC_DEFUN([KYUA_FS_LCHMOD], [ -- AC_MSG_CHECKING([for a working lchmod]) -- working_lchmod=no -- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -+ AC_CACHE_CHECK( -+ [for a working lchmod], -+ [kyua_cv_lchmod_works], [ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include - #include - #include - #include -@@ -59,15 +60,14 @@ AC_DEFUN([KYUA_FS_LCHMOD], [ - - return lchmod("conftest.txt", 0640) != -1 ? EXIT_SUCCESS : EXIT_FAILURE; - ])], -- [AC_MSG_RESULT([yes]) -- AC_DEFINE_UNQUOTED([HAVE_WORKING_LCHMOD], [1], -- [Define to 1 if your lchmod works])], -- [if test ! -f conftest.txt; then -- AC_MSG_RESULT([failed; assuming no]) -- else -- rm -f conftest.txt -- AC_MSG_RESULT([no]) -- fi]) -+ [kyua_cv_lchmod_works=yes], -+ [kyua_cv_lchmod_works=no]) -+ ]) -+ rm -f conftest.txt -+ if test "${kyua_cv_lchmod_works}" = yes; then -+ AC_DEFINE_UNQUOTED([HAVE_WORKING_LCHMOD], [1], -+ [Define to 1 if your lchmod works]) -+ fi - ]) - - -diff --git a/m4/getopt.m4 b/m4/getopt.m4 -index 534de39..9e6c04e 100644 ---- m4/getopt.m4 -+++ m4/getopt.m4 -@@ -34,8 +34,10 @@ dnl the beginning of the options string to request POSIX behavior. - dnl - dnl Defines HAVE_GETOPT_GNU if a + sign is supported. - AC_DEFUN([_KYUA_GETOPT_GNU], [ -- AC_MSG_CHECKING([whether getopt allows a + sign for POSIX behavior]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -+ AC_CACHE_CHECK( -+ [whether getopt allows a + sign for POSIX behavior optreset], -+ [kyua_cv_getopt_gnu], [ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include - #include - #include ], [ - int argc = 4; -@@ -67,11 +69,13 @@ AC_DEFUN([_KYUA_GETOPT_GNU], [ - - return (seen_a && !seen_plus) ? EXIT_SUCCESS : EXIT_FAILURE; - ])], -- [getopt_allows_plus=yes -- AC_DEFINE([HAVE_GETOPT_GNU], [1], -- [Define to 1 if getopt allows a + sign for POSIX behavior])], -- [getopt_allows_plus=no]) -- AC_MSG_RESULT(${getopt_allows_plus}) -+ [kyua_cv_getopt_gnu=yes], -+ [kyua_cv_getopt_gnu=no]) -+ ]) -+ if test "${kyua_cv_getopt_gnu}" = yes; then -+ AC_DEFINE([HAVE_GETOPT_GNU], [1], -+ [Define to 1 if getopt allows a + sign for POSIX behavior]) -+ fi - ]) - - dnl Checks if optreset exists to reset the processing of getopt(3) options. -@@ -82,9 +86,10 @@ dnl is only present in the BSD versions of getopt(3). - dnl - dnl Defines HAVE_GETOPT_WITH_OPTRESET if optreset exists. - AC_DEFUN([_KYUA_GETOPT_WITH_OPTRESET], [ -- AC_MSG_CHECKING([whether getopt has optreset]) -- -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_CACHE_CHECK( -+ [whether getopt has optreset], -+ [kyua_cv_getopt_optreset], [ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include - #include - -@@ -95,12 +100,13 @@ main(void) - return EXIT_SUCCESS; - } - ])], -- [getopt_optreset=yes -- AC_DEFINE([HAVE_GETOPT_WITH_OPTRESET], [1], -- [Define to 1 if getopt has optreset])], -- [getopt_optreset=no]) -- -- AC_MSG_RESULT([${getopt_optreset}]) -+ [kyua_cv_getopt_optreset=yes], -+ [kyua_cv_getopt_optreset=no]) -+ ]) -+ if test "${kyua_cv_getopt_optreset}" = yes; then -+ AC_DEFINE([HAVE_GETOPT_WITH_OPTRESET], [1], -+ [Define to 1 if getopt has optreset]) -+ fi - ]) - - -@@ -114,9 +120,10 @@ dnl - dnl Sets the GETOPT_OPTIND_RESET_VALUE macro to the integer value that has to - dnl be passed to optind to reset option processing. - AC_DEFUN([_KYUA_GETOPT_OPTIND_RESET_VALUE], [ -- AC_MSG_CHECKING([for the optind value to reset getopt processing]) -- -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_CACHE_CHECK( -+ [for the optind value to reset getopt processing], -+ [kyua_cv_getopt_optind_reset_value], [ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include -@@ -189,12 +196,12 @@ main(void) - return EXIT_SUCCESS; - } - ])], -- [optind_reset_value=0], -- [optind_reset_value=1]) -- -- AC_DEFINE_UNQUOTED([GETOPT_OPTIND_RESET_VALUE], [${optind_reset_value}], -+ [kyua_cv_getopt_optind_reset_value=0], -+ [kyua_cv_getopt_optind_reset_value=1]) -+ ]) -+ AC_DEFINE_UNQUOTED([GETOPT_OPTIND_RESET_VALUE], -+ [${kyua_cv_getopt_optind_reset_value}], - [Define to the optind value to reset getopt processing]) -- AC_MSG_RESULT([${optind_reset_value}]) - ]) - - -diff --git a/m4/signals.m4 b/m4/signals.m4 -index e1d689c..8ceff43 100644 ---- m4/signals.m4 -+++ m4/signals.m4 -@@ -32,8 +32,10 @@ dnl - dnl Detect the last valid signal number. - dnl - AC_DEFUN([KYUA_LAST_SIGNO], [ -- AC_MSG_CHECKING(for the last valid signal) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -+ AC_CACHE_CHECK( -+ [for the last valid signal], -+ [kyua_cv_signals_lastno], [ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include - #include - #include - #include -@@ -75,16 +77,14 @@ AC_DEFUN([KYUA_LAST_SIGNO], [ - - return EXIT_SUCCESS; - ])], -- [if test ! -f conftest.cnt; then -- last_signo=15 -- AC_MSG_RESULT(failed; assuming ${last_signo}) -- else -- last_signo=$(cat conftest.cnt) -- rm -f conftest.cnt -- AC_MSG_RESULT(${last_signo}) -- fi], -- [last_signo=15 -- AC_MSG_RESULT(failed; assuming ${last_signo})]) -- AC_DEFINE_UNQUOTED([LAST_SIGNO], [${last_signo}], -+ [if test ! -f conftest.cnt; then -+ kyua_cv_signals_lastno=15 -+ else -+ kyua_cv_signals_lastno=$(cat conftest.cnt) -+ rm -f conftest.cnt -+ fi], -+ [kyua_cv_signals_lastno=15]) -+ ]) -+ AC_DEFINE_UNQUOTED([LAST_SIGNO], [${kyua_cv_signals_lastno}], - [Define to the last valid signal number]) - ]) --- -1.8.4.1 - diff --git a/srcpkgs/kyua-testers/template b/srcpkgs/kyua-testers/template index def1a8b2f67..2e3a4b0c710 100644 --- a/srcpkgs/kyua-testers/template +++ b/srcpkgs/kyua-testers/template @@ -1,7 +1,7 @@ # Template file for 'kyua-testers' pkgname=kyua-testers -version=0.1 -revision=3 +version=0.2 +revision=1 build_style=gnu-configure configure_args=" kyua_cv_attribute_noreturn=yes kyua_cv_lchmod_works=no @@ -15,7 +15,7 @@ maintainer="Juan RP " license="BSD" homepage="http://code.google.com/p/kyua" distfiles="https://kyua.googlecode.com/files/${pkgname}-${version}.tar.gz" -checksum=08f30eef2c967c5451f858ed63c0c4647899d634fcb32dc5fe5fbdb3e0170e49 +checksum=8e788d9f6a1b86bcf3b436e870cbc801cf7650fa3f0f82da8b025e36ffe84feb long_desc=" Kyua (pronounced Q.A.) is a testing framework for both developers and users. Kyua is different from most other testing frameworks in that it puts the end diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index cf2c7fbf88f..88f66674d1f 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,6 +1,6 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.49 +version=2.4.50 revision=1 build_style=gnu-configure configure_args="--enable-udev" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://dri.freedesktop.org/" license="MIT" distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" -checksum=25d7d3fd30d8c350d3b87b3048f1c0cf0be295a40197a49acc374d4f4ae97a7d +checksum=3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045 pre_configure() { sed -e '/pthread-stubs/d' -i configure.ac diff --git a/srcpkgs/libmikmod/template b/srcpkgs/libmikmod/template index 8e315dde235..a7a629c68c6 100644 --- a/srcpkgs/libmikmod/template +++ b/srcpkgs/libmikmod/template @@ -1,40 +1,25 @@ # Template file for 'libmikmod' pkgname=libmikmod -version=3.3.2 -revision=1 +version=3.3.4 +revision=2 build_style=gnu-configure configure_args="--disable-static" short_desc="MikMod Sound Library" maintainer="Juan RP " homepage="http://mikmod.shlomifish.org/" license="GPL-2, LGPL-2.1" -distfiles="${homepage}/files/${pkgname}-${version}.tar.gz" -checksum=2311b209255bf24e95161907a16778cb054ac6d447fd8d05f1f0e41a555c7580 -long_desc=" - The MikMod sound library is an excellent way for a programmer to - add music and sound effects to an application. It is a powerful - and flexible library, with a simple and easy-to-learn API. - - Besides, the library is very portable and runs under a lot of - Unices, as well as under OS/2, MacOS and Windows. Third party - individuals also maintain ports on other systems, including MS-DOS, - and BeOS. - - MikMod is able to play a wide range of module formats, as well as - digital sound files. It can take advantage of particular features - of your system, such as sound redirection over the network. And - due to its modular nature, the library can be extended to support - more sound or module formats, as well as new hardware or other - sound output capabilities, as they appear." +distfiles="${SOURCEFORGE_SITE}/mikmod/${pkgname}-${version}.tar.gz" +checksum=2e8ca1d945ff7330741d085548a6d4e8b2f6a9d41edda773607905d8905683ae libmikmod-devel_package() { - depends="libmikmod>=${version}" + depends="libmikmod>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/bin vmove usr/include vmove usr/share vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/libpipeline/template b/srcpkgs/libpipeline/template index 39c3dc617eb..76af918afcb 100644 --- a/srcpkgs/libpipeline/template +++ b/srcpkgs/libpipeline/template @@ -1,6 +1,6 @@ # Template file for 'libpipeline' pkgname=libpipeline -version=1.2.3 +version=1.2.5 revision=1 build_style=gnu-configure short_desc="A pipeline manipulation library" @@ -8,20 +8,21 @@ maintainer="Juan RP " homepage="http://libpipeline.nongnu.org/" license="GPL-2" distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=40e9b56e957a5a55c0f3543ff4931f291586638ca502fbe95e8e7eae5f17cbf2 +checksum=2de10806d9b7dda54f4098d2c12e36e960b954d1325c0885ac01c3c7ee908d5b libpipeline-devel_package() { - depends="${sourcepkg}>=${version}" - short_desc+=" -- development files" + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } libpipeline_package() { pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/libusbx/template b/srcpkgs/libusbx/template index a32a2b7a955..a193f89c5ad 100644 --- a/srcpkgs/libusbx/template +++ b/srcpkgs/libusbx/template @@ -1,6 +1,6 @@ # Template file for 'libusbx' pkgname=libusbx -version=1.0.16 +version=1.0.17 revision=1 build_style=gnu-configure makedepends="libudev-devel" @@ -9,10 +9,10 @@ maintainer="Juan RP " license="LGPL-2.1" homepage="http://libusbx.org" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=5b335cf9572d793da6ced55bce633894288a8ff39557f07ccc798f2cb74cb580 +checksum=876f8d2c3fee73840a89cb78f3e384c0ab73a67f9155a010b1a5a73ece5145b8 libusbx-devel_package() { - depends="${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" provides="libusb-devel-${version}_${revision}" replaces="libusb-devel>=0" short_desc+=" - development files" @@ -28,6 +28,6 @@ libusbx_package() { provides="libusb-${version}_${revision}" replaces="libusb>=0" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/linux3.10/template b/srcpkgs/linux3.10/template index 207960123da..6668d06106d 100644 --- a/srcpkgs/linux3.10/template +++ b/srcpkgs/linux3.10/template @@ -1,7 +1,7 @@ # Template file for 'linux3.10' # pkgname=linux3.10 -version=3.10.21 +version=3.10.23 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (3.10 series)" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" -checksum=21b4abd3eaebd86ad99f31335666a98fe845dc0ed8610bc4403f10efbab1a33e +checksum=9756377bf654d52135273c1b39a8afd8a99ee5bddb7d977c34827e49bcb701c3 only_for_archs="i686 x86_64" makedepends="bc perl kmod>=11_2 openssl which elfutils" diff --git a/srcpkgs/linux3.12/template b/srcpkgs/linux3.12/template index b3226af6f51..0ad385d4433 100644 --- a/srcpkgs/linux3.12/template +++ b/srcpkgs/linux3.12/template @@ -1,7 +1,7 @@ # Template file for 'linux3.12' # pkgname=linux3.12 -version=3.12.2 +version=3.12.4 revision=1 wrksrc="linux-${version}" maintainer="Juan RP " @@ -9,7 +9,7 @@ homepage="http://www.kernel.org" license="GPL-2" short_desc="The Linux kernel and modules (3.12 series)" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" -checksum=d3f339a29fb4905d126856803517d717649ebda355c2977510d4fc62de8672a6 +checksum=c56317810e5716dd2be7ad947a6bd174460f7cf9afb33b700a052aa91f73f9bb only_for_archs="i686 x86_64" makedepends="bc perl kmod>=11_2 openssl which elfutils" diff --git a/srcpkgs/lmdb-devel b/srcpkgs/lmdb-devel new file mode 120000 index 00000000000..d26baf46fe2 --- /dev/null +++ b/srcpkgs/lmdb-devel @@ -0,0 +1 @@ +lmdb \ No newline at end of file diff --git a/srcpkgs/lmdb/patches/install.patch b/srcpkgs/lmdb/patches/install.patch new file mode 100644 index 00000000000..7c8d604d276 --- /dev/null +++ b/srcpkgs/lmdb/patches/install.patch @@ -0,0 +1,17 @@ +--- libraries/liblmdb/Makefile.orig 2013-12-08 09:17:29.298223935 +0100 ++++ libraries/liblmdb/Makefile 2013-12-08 09:18:54.841750719 +0100 +@@ -35,10 +35,10 @@ PROGS = $(IPROGS) mtest mtest2 mtest3 mt + all: $(ILIBS) $(PROGS) + + install: $(ILIBS) $(IPROGS) $(IHDRS) +- for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done +- for f in $(ILIBS); do cp $$f $(DESTDIR)$(prefix)/lib; done +- for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done +- for f in $(IDOCS); do cp $$f $(DESTDIR)$(prefix)/man/man1; done ++ for f in $(IPROGS); do install -Dm755 $$f $(DESTDIR)$(prefix)/bin/$$f; done ++ for f in $(ILIBS); do install -Dm644 $$f $(DESTDIR)$(prefix)/lib/$$f; done ++ for f in $(IHDRS); do install -Dm644 $$f $(DESTDIR)$(prefix)/include/$$f; done ++ for f in $(IDOCS); do install -Dm644 $$f $(DESTDIR)$(prefix)/share/man/man1/$$f; done + + clean: + rm -rf $(PROGS) *.[ao] *.so *~ testdb diff --git a/srcpkgs/lmdb/template b/srcpkgs/lmdb/template new file mode 100644 index 00000000000..04c056afcd7 --- /dev/null +++ b/srcpkgs/lmdb/template @@ -0,0 +1,40 @@ +# Template file for 'lmdb' +pkgname=lmdb +version=0.9.10 +revision=1 +short_desc="Lightning Memory-Mapped Database Manager" +maintainer="Juan RP " +license="OpenLDAP 2.8 license" +homepage="http://symas.com/mdb/" + +do_fetch() { + git clone -b LMDB_${version} git://gitorious.org/mdb/mdb.git lmdb-${version} +} + +do_build() { + cd libraries/liblmdb + make XCFLAGS="$CFLAGS" CC="$CC" +} + +do_install() { + cd libraries/liblmdb + make DESTDIR=${DESTDIR} prefix=/usr install + + vinstall LICENSE 644 usr/share/licenses/lmdb + vinstall COPYRIGHT 644 usr/share/licenses/lmdb +} + +lmdb-devel_package() { + short_desc+=" - development files" + depends="lmdb>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +lmdb_package() { + pkg_install() { + vmove all + } +} diff --git a/srcpkgs/lutok/template b/srcpkgs/lutok/template index c5d3f866cd0..dee7429ad99 100644 --- a/srcpkgs/lutok/template +++ b/srcpkgs/lutok/template @@ -1,6 +1,6 @@ # Template file for 'lutok' pkgname=lutok -version=0.3 +version=0.4 revision=1 build_style=gnu-configure configure_args="--with-doxygen" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="BSD" homepage="http://code.google.com/p/lutok" distfiles="https://lutok.googlecode.com/files/lutok-$version.tar.gz" -checksum=32d8e823432560dae3606094f1203cfab0f23c889440cc7b92a1739a68c2369e +checksum=2cec51efa0c8d65ace8b21eaa08384b77abc5087b46e785f78de1c21fb754cd5 long_desc=" Lutok provides thin C++ wrappers around the Lua C API to ease the interaction between C++ and Lua. These wrappers make intensive use of RAII to prevent diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template index 6e89db2fe34..3e6a11a7ab1 100644 --- a/srcpkgs/minetest/template +++ b/srcpkgs/minetest/template @@ -1,17 +1,19 @@ # Template file for 'minetest' pkgname=minetest -version=0.4.7 -revision=1 +version=0.4.8 +revision=2 build_style=cmake -configure_args="-DRUN_IN_PLACE=0 -DLUAJIT=1 -DENABLE_FREETYPE=1" +configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 + -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2" short_desc="An InfiniMiner/Minecraft inspired game" maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.minetest.org" hostmakedepends="cmake pkg-config" -makedepends="lua-devel libjpeg-turbo-devel libpng-devel LuaJIT-devel - freetype-devel MesaLib-devel libopenal-devel libvorbis-devel +makedepends=" + sqlite-devel libcurl-devel lua-devel libjpeg-turbo-devel libpng-devel + LuaJIT-devel freetype-devel MesaLib-devel libopenal-devel libvorbis-devel irrlicht-devel hicolor-icon-theme desktop-file-utils" do_fetch() { diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 175ea3296df..04d46db9ffb 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,6 +1,6 @@ # Template file for 'musl'. pkgname=musl -version=0.9.9 +version=0.9.12 revision=1 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" @@ -9,19 +9,23 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=91f67d4e1e696df344c93b46bfcb1f6ad6d820e6ae544e3673f496e2d308f492 +checksum=72353f9e1f2fdaf5e88223dcd1cfa5555f5a364eb5e4a9967de1fd44cc4c6d3e long_desc=" A new standard library to power a new generation of Linux-based devices. musl is lightweight, fast, simple, free, and strives to be correct in the sense of standards-conformance and safety." -post_install() { - vmove "lib/*" usr/lib +do_install() { + # Move everything to /usr. + vmkdir usr/lib + ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib + make DESTDIR=${DESTDIR} install + rm ${DESTDIR}/lib } musl_package() { conflicts="glibc>=0" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template index d751ff17944..69ea2a4d852 100644 --- a/srcpkgs/netbsd-rumpkernel/template +++ b/srcpkgs/netbsd-rumpkernel/template @@ -1,12 +1,14 @@ # Template file for 'netbsd-rumpkernel'. pkgname=netbsd-rumpkernel -version=20130702 +version=20131206 revision=1 -hostmakedepends="cvs" +wrksrc="buildrump-${version}" short_desc="NetBSD rump kernel" maintainer="Juan RP " license="BSD" homepage="https://github.com/anttikantee/buildrump.sh" +distfiles="${SOURCEFORGE_SITE}/rumpkernel/buildrump-${version}.tar.xz" +checksum=9ee6b0657a787228c7f9a06e47a7c165d69217de02e71111286422c0587fa31c long_desc=" This package provides NetBSD kernel drivers which have been built from unmodified kernel source code as userspace libraries. Examples of @@ -18,17 +20,6 @@ long_desc=" This package enables for example userspace TCP termination and utilities to access file systems without having to mount them on the host." - -do_fetch() { - local url="git://github.com/anttikantee/buildrump.sh.git" - msg_normal "Fetching source from $url ...\n" - git clone ${url} ${pkgname}-${version} -} - -do_configure() { - CVS_PASSFILE=/dev/null ./buildrump.sh checkout -} - do_build() { ./buildrump.sh ${makejobs} -r -V MKPICINSTALL=no -d ${DESTDIR}/usr tools ./buildrump.sh ${makejobs} -r -d ${DESTDIR}/usr build @@ -42,7 +33,7 @@ do_install() { } netbsd-rumpkernel-devel_package() { - depends="${sourcepkg}>=$version" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -54,6 +45,6 @@ netbsd-rumpkernel-devel_package() { netbsd-rumpkernel_package() { pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/ntp/files/ntp.conf b/srcpkgs/ntp/files/ntp.conf index d8239c9937f..589141a6a35 100644 --- a/srcpkgs/ntp/files/ntp.conf +++ b/srcpkgs/ntp/files/ntp.conf @@ -14,6 +14,6 @@ restrict default nomodify nopeer restrict 127.0.0.1 # Location of drift and log files -driftfile /var/db/ntpd.drift +driftfile /var/db/ntpd/drift logfile /var/log/ntpd.log -pidfile /var/run/ntpd.pid +pidfile /run/ntpd.pid diff --git a/srcpkgs/ntp/files/ntpd.tmpfiles b/srcpkgs/ntp/files/ntpd.tmpfiles new file mode 100644 index 00000000000..7f2ff37896c --- /dev/null +++ b/srcpkgs/ntp/files/ntpd.tmpfiles @@ -0,0 +1 @@ +d /var/db/ntpd 0755 ntpd ntpd diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index eed5b30901d..5941be2ddaf 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.6p5 -revision=12 +revision=14 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --with-lineeditlibs=readline" hostmakedepends="bison perl-HTML-Parser" @@ -15,6 +15,7 @@ checksum=d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c post_install() { # ntpd service + vinstall ${FILESDIR}/ntpd.tmpfiles 644 usr/lib/tmpfiles.d ntpd.conf vinstall ${FILESDIR}/ntpd.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/ntp.conf 644 etc # ntpdate service diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 44eb4b963c3..c4846af5f51 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,12 +1,8 @@ # Template file for 'opensmtpd' # -# The 5.3.3p1.tar.gz is incomplete and autogenerated files are missing. -_distver=201311201707p1 - pkgname=opensmtpd -version=5.3.3p1 +version=5.4.1p1 revision=1 -wrksrc="${pkgname}-${_distver}" build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-maildir=/var/spool/mail --with-privsep-path=/var/db @@ -18,14 +14,15 @@ short_desc="Free implementation of the server-side SMTP protocol" maintainer="Juan RP " license="BSD, ISC, MIT" homepage="http://www.opensmtpd.org" -distfiles="http://www.opensmtpd.org/archives/${pkgname}-${_distver}.tar.gz" -checksum=2be1ff6e7334565ac6a4b2eebd98d6cf80c1917d7293c9208c75c43f6cb85689 +distfiles="http://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz" +checksum=7debbf7e55ff3687617ae2c3b38e1cf30574b96f56b869e597c0e98478e5b5d9 pre_configure() { # XXX hardcode the libevent major version for now. # XXX the configure test needs to execute a binary to # XXX get this result. sed -e 's,^\(libevent_major_version\)=.*$,\1=2,' -i configure + sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf } post_install() { diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template index 89a11e577b5..5c0c7311b2b 100644 --- a/srcpkgs/opus/template +++ b/srcpkgs/opus/template @@ -1,6 +1,6 @@ # Template file for 'opus' pkgname=opus -version=1.0.3 +version=1.1 revision=1 build_style=gnu-configure configure_args="--enable-float-approx" @@ -9,14 +9,14 @@ maintainer="Juan RP " homepage="http://www.opus-codec.org/" license="BSD" distfiles="http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz" -checksum=191a089c92dbc403de6980463dd3604b65beb12d283c607e246c8076363cb49c +checksum=b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95 post_install() { vinstall COPYING 644 usr/share/licenses/opus } opus-devel_package() { - depends="opus-${version}_${revision}" + depends="opus>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -29,6 +29,6 @@ opus-devel_package() { opus_package() { pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/procps-ng/files/sysctl.conf b/srcpkgs/procps-ng/files/sysctl.conf deleted file mode 100644 index fae2c608203..00000000000 --- a/srcpkgs/procps-ng/files/sysctl.conf +++ /dev/null @@ -1,38 +0,0 @@ -# Configuration file for runtime kernel parameters. -# See sysctl.conf(5) for more information. - -# Have the CD-ROM close when you use it, and open when you are done. -#dev.cdrom.autoclose = 1 -#dev.cdrom.autoeject = 1 - -# Protection from the SYN flood attack. -net.ipv4.tcp_syncookies = 1 - -# See evil packets in your logs. -#net.ipv4.conf.all.log_martians = 1 - -# Never accept redirects or source routes (these are only useful for routers). -#net.ipv4.conf.all.accept_redirects = 0 -#net.ipv4.conf.all.accept_source_route = 0 -#net.ipv6.conf.all.accept_redirects = 0 -#net.ipv6.conf.all.accept_source_route = 0 - -# Disable packet forwarding. -net.ipv4.ip_forward = 0 -net.ipv6.conf.all.forwarding = 0 - -# Tweak the port range used for outgoing connections. -#net.ipv4.ip_local_port_range = 32768 61000 - -# Tweak those values to alter disk syncing and swap behavior. -#vm.vfs_cache_pressure = 100 -#vm.laptop_mode = 0 -#vm.swappiness = 60 - -# Tweak how the flow of kernel messages is throttled. -#kernel.printk_ratelimit_burst = 10 -#kernel.printk_ratelimit = 5 - -# Reboot 600 seconds after kernel panic or oops. -#kernel.panic_on_oops = 1 -#kernel.panic = 600 diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index 73f1123bf16..c75117591fc 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,63 +1,33 @@ # Template file for 'procps-ng' pkgname=procps-ng -version=3.3.8 +version=3.3.9 revision=1 +build_style=gnu-configure +configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin + --libdir=/usr/lib --disable-static --with-systemd + ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes + ac_cv_func_strtod=yes ac_cv_func_mmap_fixed_mapped=yes" +hostmakedepends="pkg-config" +makedepends="ncurses-devel systemd-devel" short_desc="Utilities for monitoring your system and its processes" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://gitorious.org/procps" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/Production/${pkgname}-${version}.tar.xz" +checksum=00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 - -hostmakedepends="libtool automake gettext-devel pkg-config" -makedepends="ncurses-devel" - -do_fetch() { - git clone git://gitorious.org/procps/procps.git \ - -b v${version} ${pkgname}-${version} -} - -do_configure() { - echo ${version} > .tarball-version - ./autogen.sh - - ./configure ${configure_args} --exec-prefix=/ \ - --prefix=/usr --libdir=/usr/lib --disable-static \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_strtod=yes ac_cv_func_mmap_fixed_mapped=yes -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install - - vinstall ${FILESDIR}/sysctl.conf 644 etc - +post_install() { # provided by util-linux - rm ${DESTDIR}/bin/kill + rm ${DESTDIR}/usr/bin/kill rm ${DESTDIR}/usr/share/man/man1/kill.1 - vmkdir usr/bin - vmkdir usr/sbin - mv ${DESTDIR}/bin/* ${DESTDIR}/usr/bin - mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin - - # Create pidof symlink. - ln -sfr ${DESTDIR}/usr/bin/pgrep ${DESTDIR}/usr/bin/pidof - # Remove devel and docs. rm -rf ${DESTDIR}/usr/share/doc \ ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig - + rm -f ${DESTDIR}/usr/lib/*.so } procps-ng_package() { - conf_files="/etc/sysctl.conf" - replaces="procps>=0" - provides="procps-${version}" conflicts="coreutils<8.21_3" pkg_install() { vmove all diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 148f78919ee..393e88ecca2 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,8 +1,8 @@ # Template build file for 'sqlite'. pkgname=sqlite -version=3.8.1 +version=3.8.2 revision=1 -_amalgamationver=3080100 +_amalgamationver=3080200 wrksrc="sqlite-autoconf-${_amalgamationver}" build_style=gnu-configure makedepends="readline-devel" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.sqlite.org" license="Public Domain" distfiles="http://www.sqlite.org/2013/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=176df9a5dfbf4cf8516ef7b91ee187779855f51d4502534a5826034458ba2bb5 +checksum=a0851d06092c8208e4dd947f569f40db476b472b22e3e10e2f52f3c5e94fef92 do_configure() { export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 \ diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index 9699ed2d332..4694002d01e 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -1,6 +1,6 @@ # Template file for 'webkitgtk' pkgname=webkitgtk -version=2.2.2 +version=2.2.3 revision=1 build_style=gnu-configure configure_args="--with-gtk=3.0 --enable-introspection" @@ -9,11 +9,9 @@ maintainer="Juan RP " homepage="http://webkitgtk.org/" license="LGPL-2.1, Simplified BSD (2 clause)" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" -checksum=4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d - -hostmakedepends="perl pkg-config intltool which gperf - flex ruby gobject-introspection" +checksum=94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605 +hostmakedepends="perl pkg-config intltool which gperf flex ruby gobject-introspection" makedepends=" libjpeg-turbo-devel libpng-devel>=1.6 sqlite-devel harfbuzz-devel>=0.9.19 gst-plugins-base1-devel libsoup-devel>=2.42 libxslt-devel icu-devel>=49 diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template index 58c5cdc89af..f755ccb403b 100644 --- a/srcpkgs/wv/template +++ b/srcpkgs/wv/template @@ -1,16 +1,16 @@ # Template file for 'wv' pkgname=wv -version=1.2.4 +version=1.2.9 +revision=1 build_style=gnu-configure -revision=6 hostmakedepends="pkg-config" makedepends="libpng-devel>=1.6 libglib-devel libxml2-devel libgsf-devel" -short_desc="wv is a library which allows access to Microsoft Word files." +short_desc="A library which allows access to Microsoft Word files" homepage="http://wvware.sourceforge.net/" license="GPL-3" maintainer="davehome " -distfiles="${SOURCEFORGE_SITE}/${pkgname}ware/${pkgname}-$version.tar.gz" -checksum=673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6 +distfiles="http://www.abisource.com/downloads/${pkgname}/${version}/${pkgname}-${version}.tar.gz" +checksum=4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d long_desc=" wv is a library which allows access to Microsoft Word files. It can load and parse Word 2000, 97, 95 and 6 file formats. (These are the file formats @@ -20,16 +20,17 @@ long_desc=" libwv_package() { short_desc+=" - Runtime library" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } } wv-devel_package() { - depends="libwv>=$version" + depends="libgsf-devel libpng-devel zlib-devel libwv>=${version}_${revision}" short_desc+=" - Development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template index aa654686f57..993b145805a 100644 --- a/srcpkgs/xbps-git/template +++ b/srcpkgs/xbps-git/template @@ -1,7 +1,7 @@ # Template file for 'xbps-git' pkgname=xbps-git -version=20131130 -revision=2 +version=20131208 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests" hostmakedepends="which pkg-config" diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template index facb45aadad..b5eb59167f8 100644 --- a/srcpkgs/xbps-src/template +++ b/srcpkgs/xbps-src/template @@ -1,6 +1,6 @@ # Template file for 'xbps-src' pkgname=xbps-src -version=20131204 +version=20131209 revision=1 bootstrap=yes build_style=gnu-makefile diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index e22e16bc971..7d5b1cd37ed 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-input-synaptics'. pkgname=xf86-input-synaptics -version=1.7.1 -revision=2 +version=1.7.2 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libXtst-devel mtdev-devel @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.x.org/" license="MIT" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e +checksum=63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd xf86-input-synaptics-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template index 8805eca2496..98d52710e03 100644 --- a/srcpkgs/xf86-video-modesetting/template +++ b/srcpkgs/xf86-video-modesetting/template @@ -1,7 +1,7 @@ # Template build file for 'xf86-video-modesetting'. pkgname=xf86-video-modesetting -version=0.8.0 -revision=2 +version=0.8.1 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.14" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" -checksum=13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8 +checksum=3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca xf86-video-modesetting_package() { depends="xserver-abi-video-14_1" diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template index 8c068a414c2..cca05d1e05c 100644 --- a/srcpkgs/xorg-util-macros/template +++ b/srcpkgs/xorg-util-macros/template @@ -1,23 +1,20 @@ # Template file for 'xorg-util-macros' pkgname=xorg-util-macros -version=1.15.0 -revision=3 +version=1.18.0 +revision=1 +wrksrc="${pkgname/xorg-/}-${version}" build_style=gnu-configure hostmakedepends="pkg-config" short_desc="Xorg autotool macros" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " -wrksrc="util-macros-${version}" distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2" -checksum=b31c6d39014e537ff95609661a4f8258f7c4a4f3b8bdfdad3d69bdd5cb80f40e -long_desc=" - This package contains the autoconf/automake macros shared by the various - modular Xorg components." +checksum=e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b xorg-util-macros_package() { noarch="yes" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index fcc2db53dda..22add0e08e9 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,6 +1,6 @@ # Template file for 'youtube-dl' pkgname=youtube-dl -version=2013.11.22.2 +version=2013.12.03 revision=1 wrksrc="${pkgname}" makedepends="python" @@ -9,7 +9,7 @@ maintainer="pancake " license="Public Domain" homepage="http://rg3.github.com/youtube-dl/" distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz" -checksum=cb4a68565c27c73e7088f9da764a2996505ca06459d36e2f5176fa0dda89659e +checksum=0d8a4e66971949645aedfdef8c9a1b3010aa6abea19875571040eca228fabecf do_install() { vinstall ${pkgname} 755 usr/bin