From ab2ca60f6bf8dd23c8ce30a16fabafc2b491d9ac Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 16:49:17 +0200 Subject: [PATCH 1/7] vim: add global vimrc with common-sense settings --- srcpkgs/vim/files/vimrc | 10 ++++++++++ srcpkgs/vim/template | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/vim/files/vimrc diff --git a/srcpkgs/vim/files/vimrc b/srcpkgs/vim/files/vimrc new file mode 100644 index 00000000000..c91ca46aaca --- /dev/null +++ b/srcpkgs/vim/files/vimrc @@ -0,0 +1,10 @@ +" System-wide vim configuration + +set nocompatible +set backspace=indent,eol,start +set history=50 +set ruler + +if filereadable("/etc/vimrc.local") + source /etc/vimrc.local +endif diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index fca8a7bf3ec..15b83cc80eb 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -3,7 +3,7 @@ pkgname=vim _distver=7.4 _patchver=307 version=${_distver}.${_patchver} -revision=1 +revision=2 hostmakedepends="mercurial pkg-config" makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel desktop-file-utils hicolor-icon-theme ruby-devel python-devel lua-devel perl" @@ -99,6 +99,7 @@ vim-common_package() { replaces="vim<=7.2_2" pkg_install() { vmove usr/share/vim + vinstall ${FILESDIR}/vimrc 644 usr/share/vim } } From b40cc14ca4b2cf7ee3713eeaf6d80678e19c1d5f Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 20:39:42 +0200 Subject: [PATCH 2/7] New package: cvsps2-2.1 --- srcpkgs/cvsps2/patches/inet_addr-64bit.patch | 12 ++++++++++++ srcpkgs/cvsps2/template | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 srcpkgs/cvsps2/patches/inet_addr-64bit.patch create mode 100644 srcpkgs/cvsps2/template diff --git a/srcpkgs/cvsps2/patches/inet_addr-64bit.patch b/srcpkgs/cvsps2/patches/inet_addr-64bit.patch new file mode 100644 index 00000000000..c064941690e --- /dev/null +++ b/srcpkgs/cvsps2/patches/inet_addr-64bit.patch @@ -0,0 +1,12 @@ +Use INADDR_NONE instead of -1 to check inet_addr() result +--- cbtcommon/tcpsocket.c.1 2013-04-14 13:21:14.848464155 +0400 ++++ cbtcommon/tcpsocket.c 2013-04-14 13:23:23.015136709 +0400 +@@ -198,7 +198,7 @@ + memcpy(dest, &ip.s_addr, sizeof(ip.s_addr)); + } + #else +- if ( (*dest = inet_addr(addr_str)) != -1) ++ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE) + { + /* nothing */ + } diff --git a/srcpkgs/cvsps2/template b/srcpkgs/cvsps2/template new file mode 100644 index 00000000000..2ef6c72b12d --- /dev/null +++ b/srcpkgs/cvsps2/template @@ -0,0 +1,17 @@ +# Template file for 'cvsps2' +pkgname=cvsps2 +version=2.1 +revision=1 +wrksrc=cvsps-${version} +build_style=gnu-makefile +makedepends="zlib-devel" +short_desc="Generating 'patchsets' from a CVS repo (for git-cvsimport)" +maintainer="Christian Neukirchen " +license="GPL-2" +homepage="http://www.cobite.com/cvsps/" +distfiles="http://www.cobite.com/cvsps/cvsps-${version}.tar.gz" +checksum=91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a + +do_install() { + make install prefix=$DESTDIR/usr +} From 729f378f5da9dde9c4d141a268aebe8eab38f6b9 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 21:11:49 +0200 Subject: [PATCH 3/7] New package: jq-1.4 --- common/shlibs | 1 + srcpkgs/jq-devel | 1 + srcpkgs/jq/template | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 120000 srcpkgs/jq-devel create mode 100644 srcpkgs/jq/template diff --git a/common/shlibs b/common/shlibs index 50f374ea318..a9d06c450fe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1669,3 +1669,4 @@ libnetpbm.so.11 libnetpbm-10.66.03_2 libid3.so id3lib-3.8.3_1 libid3-3.8.so.3 id3lib-3.8.3_1 libgirara-gtk3.so.1 girara-0.2.2_1 +libjq.so.1 jq-devel-1.4_1 diff --git a/srcpkgs/jq-devel b/srcpkgs/jq-devel new file mode 120000 index 00000000000..ef0d2eaa7ff --- /dev/null +++ b/srcpkgs/jq-devel @@ -0,0 +1 @@ +jq \ No newline at end of file diff --git a/srcpkgs/jq/template b/srcpkgs/jq/template new file mode 100644 index 00000000000..04d1696c576 --- /dev/null +++ b/srcpkgs/jq/template @@ -0,0 +1,26 @@ +# Template file for 'jq' +pkgname=jq +version=1.4 +revision=1 +build_style=gnu-configure +short_desc="Command-line JSON processor" +maintainer="Christian Neukirchen " +license="custom" +homepage="http://stedolan.github.io/jq/" +distfiles="http://stedolan.github.io/jq/download/source/${pkgname}-${version}.tar.gz" +checksum=998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d + +post_install() { + rm -r ${DESTDIR}/usr/share/doc/$pkgname + vlicense COPYING +} + +jq-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so*" + } +} From d62e5c2bd32ae717cc854629012d604c336aadf4 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 22:01:57 +0200 Subject: [PATCH 4/7] New package: crack-attack-1.1.14 --- srcpkgs/crack-attack/template | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 srcpkgs/crack-attack/template diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template new file mode 100644 index 00000000000..93433f3739c --- /dev/null +++ b/srcpkgs/crack-attack/template @@ -0,0 +1,44 @@ +# Template file for 'crack-attack' +pkgname=crack-attack +version=1.1.14 +revision=1 +wrksrc=$pkgname-$version +create_wrksrc=yes +build_wrksrc=$wrksrc +#only_for_archs="i686 x86_64" +build_style=gnu-configure +configure_args="--enable-sound=yes" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/sa 0755 root root" +hostmakedepends="pkg-config rpmextract + gtk+-devel SDL_mixer-devel libfreeglut-devel libXmu-devel" +makedepends="" +depends="" +short_desc="Tetris Attack clone" +maintainer="Christian Neukirchen " +license="GPL-2" +homepage="http://www.nongnu.org/crack-attack/" +distfiles="http://kojipkgs.fedoraproject.org/packages/${pkgname}/${version}/28.fc21/src/${pkgname}-${version}-28.fc21.src.rpm" +checksum="6fb2ad5a1dcdc590fcbeb4d1925a7e55f1af27780a5550cded280475d2c08b1d" + +post_extract() { + tar xf crack-attack-1.1.14.tar.bz2 + tar xf crack-attack-music.tar.gz + tar xf crack-attack-sounds.tar.gz + + cd $build_wrksrc + cat ../*.patch | patch -p1 +} + +post_install() { + vcopy ../music usr/share/${pkgname} + vcopy ../data/sounds usr/share/${pkgname} + vlicense ../music-sound-copyright.txt + + vmkdir usr/share/applications + mv $DESTDIR/usr/share/${pkgname}/${pkgname}.desktop $DESTDIR/usr/share/applications/ + vmkdir usr/share/pixmaps + cp $DESTDIR/usr/share/${pkgname}/crack-attack.xpm $DESTDIR/usr/share/pixmaps +} From b645c1e62166e2bb96f46a6b260aed347b4a4b1b Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 22:24:40 +0200 Subject: [PATCH 5/7] New package: twm-1.0.8 --- srcpkgs/twm/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/twm/template diff --git a/srcpkgs/twm/template b/srcpkgs/twm/template new file mode 100644 index 00000000000..edc101e9efd --- /dev/null +++ b/srcpkgs/twm/template @@ -0,0 +1,13 @@ +# Template file for 'twm' +pkgname=twm +version=1.0.8 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config xorg-util-macros bison" +makedepends="libXmu-devel" +short_desc="Tab Window Manager for the X Window System" +maintainer="Christian Neukirchen " +license="MIT" +homepage="http://www.x.org/archive/X11R6.8.1/doc/twm.1.html" +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" +checksum=7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44 From c429edfbebc6d3a3a99d7ad129ff31e096212a5a Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 22:25:00 +0200 Subject: [PATCH 6/7] New package: xclock-1.0.7 --- srcpkgs/xclock/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/xclock/template diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template new file mode 100644 index 00000000000..e28722f1056 --- /dev/null +++ b/srcpkgs/xclock/template @@ -0,0 +1,13 @@ +# Template file for 'xclock' +pkgname=xclock +version=1.0.7 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config xorg-util-macros" +makedepends="libXmu-devel libXaw-devel libxkbfile-devel libXft-devel" +short_desc="analog / digital clock for X" +maintainer="Christian Neukirchen " +license="MIT" +homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html" +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" +checksum=23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 From 032dcaf92218a194aa51cc1d3b0fbf815b0becc7 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 8 Jul 2014 22:25:16 +0200 Subject: [PATCH 7/7] New package: xeyes-1.1.1 --- srcpkgs/xeyes/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/xeyes/template diff --git a/srcpkgs/xeyes/template b/srcpkgs/xeyes/template new file mode 100644 index 00000000000..3916e8733d3 --- /dev/null +++ b/srcpkgs/xeyes/template @@ -0,0 +1,13 @@ +# Template file for 'xeyes' +pkgname=xeyes +version=1.1.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config xorg-util-macros" +makedepends="libXmu-devel libXt-devel libXrender-devel" +short_desc="Follow the mouse" +maintainer="Christian Neukirchen " +license="MIT" +homepage="http://www.x.org/archive/X11R6.8.1/doc/xeyes.1.html" +distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" +checksum=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521