Merge remote branch 'alpine/master'

6 files changed, 142 insertions, 5 deletions

diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
index 814ba5213..0e642d735 100644
--- a/main/epdfview/APKBUILD
+++ b/main/epdfview/APKBUILD
@@ -1,11 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=epdfview
 pkgver=0.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 license="GPL"
-#depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1 
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="poppler-gtk-dev cups-dev"
 source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
diff --git a/main/mrtg/APKBUILD b/main/mrtg/APKBUILD
new file mode 100644
index 000000000..9334db7a4
--- /dev/null
+++ b/main/mrtg/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Jeff Bilyk<jbilyk at gmail>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=mrtg
+pkgver=2.16.4
+pkgrel=1
+pkgdesc="MRTG Network Latency Monitoring"
+url="http://oss.oetiker.ch/mrtg/"
+source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz
+	mrtg.initd mrtg.confd"
+subpackages="$pkgname-doc"
+depends="perl"
+makedepends="gd-dev libpng-dev zlib-dev"
+license="GPL"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+       cd "$_builddir"
+       ./configure --bindir=/usr/bin \
+		--libdir=/usr/lib \
+		--datadir=/usr/share/doc \
+		--mandir=/usr/share/doc/man \
+		|| return 1
+       make
+}
+
+package() {
+       cd "$_builddir"
+       make install DESTDIR="$pkgdir"
+}
+
+md5sums="ec298200d239832ff1648fba488e1a9e  mrtg-2.16.4.tar.gz
+47053d5e51ac8eefe3807d5168219f78  mrtg.initd
+a8d246d324b90fd1e37cc912d4651372  mrtg.confd"
diff --git a/main/mrtg/mrtg.confd b/main/mrtg/mrtg.confd
new file mode 100644
index 000000000..f3be157ba
--- /dev/null
+++ b/main/mrtg/mrtg.confd
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $
+
+MRTG_CONF="/etc/mrtg.conf"
+MRTG_PID="/var/run/mrtg.pid"
+
+# uncomment and set the following, if you'd like to run mrtg as a 
+# different user/group
+#MRTG_USER=""
+#MRTG_GROUP=""
+
+# uncomment if you'd like to enable logging
+#MRTG_LOG="/var/log/mrtg.log"
+
+# set any extra options here
+MRTG_OPTS=""
diff --git a/main/mrtg/mrtg.initd b/main/mrtg/mrtg.initd
new file mode 100644
index 000000000..31adb2cf0
--- /dev/null
+++ b/main/mrtg/mrtg.initd
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.7 2007/04/19 19:08:08 cedk Exp $
+
+depend() {
+    need net
+    
+    # if monitoring snmp variables on this machine:
+    # use net-snmpd
+}
+ 
+checkconfig() {
+	if ! [ -f "${MRTG_CONF} ]; then
+		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
+		return 1
+	fi
+
+	mrtg --check ${MRTG_CONF}
+	return $?
+}
+
+start() {
+	# mrtg will not run if LANG=*utf8
+	# use grep instead of bash regexp for bug #159786
+	echo $LANG | grep -q -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' && LANG='C'
+
+	checkconfig || return $?
+
+	# enable logging?
+	[ -n "${MRTG_LOG}" ] && \
+		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
+	
+	# run as a different user?
+	[ -n "${MRTG_USER}" ] && \
+		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
+
+	# run as a different group?
+	[ -n "${MRTG_GROUP}" ] && \
+		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
+
+	ebegin "Starting mrtg"
+	start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\
+		--exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \
+		${MRTG_OPTS} ${MRTG_CONF} >/dev/null
+	eend $? "Failed to start mrtg"
+}
+
+stop() {
+	ebegin "Stopping mrtg"
+	start-stop-daemon --stop --quiet --pidfile ${MRTG_PID}
+	eend $? "Failed to stop mrtg"
+}
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index e04737b39..cac08c48f 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
-pkgver=1.1.44
-pkgrel=1
+pkgver=1.2
+pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 license="LGPL"
@@ -32,5 +32,5 @@ package() {
 	make prefix="$pkgdir"/usr install || return 1
 	mkdir -p "$pkgdir"/etc/wine
 }
-md5sums="f18649bd71b9099fecad22436d239cba  wine-1.1.44.tar.bz2
+md5sums="eb4e5423b277fc1e77807b04f366f7b7  wine-1.2.tar.bz2
 6ebeaa64eddf97be3267db236ce84b71  dn_skipname.patch"
diff --git a/main/xwininfo/APKBUILD b/main/xwininfo/APKBUILD
new file mode 100644
index 000000000..5074e3620
--- /dev/null
+++ b/main/xwininfo/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xwininfo
+pkgver=1.0.5
+pkgrel=1
+pkgdesc="Window information utility for X"
+url="http://cgit.freedesktop.org/xorg/app/xwininfo/"
+license="custom"
+depends=
+makedepends="libx11-dev libxext-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://xorg.freedesktop.org/releases/individual/app/xwininfo-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+md5sums="908f8bc3255f639effa9780fb1c19ea4  xwininfo-1.0.5.tar.bz2"