From de483182249bdbf22d7a7af4c976fd6a0721a0ec Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 12 Jan 2011 07:17:43 -0600 Subject: main/jwhois: promoted to main from testing --- main/jwhois/APKBUILD | 41 ++++++++++++++++++++++++++++++++++++ main/jwhois/jwhois-libiconv.patch | 10 +++++++++ testing/jwhois/APKBUILD | 41 ------------------------------------ testing/jwhois/jwhois-libiconv.patch | 10 --------- 4 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 main/jwhois/APKBUILD create mode 100644 main/jwhois/jwhois-libiconv.patch delete mode 100644 testing/jwhois/APKBUILD delete mode 100644 testing/jwhois/jwhois-libiconv.patch diff --git a/main/jwhois/APKBUILD b/main/jwhois/APKBUILD new file mode 100644 index 0000000000..d2fbc460c0 --- /dev/null +++ b/main/jwhois/APKBUILD @@ -0,0 +1,41 @@ +# Maintainer: William Pitcock +pkgname=jwhois +pkgver=4.0 +pkgrel=1 +pkgdesc="WHOIS/RWHOIS client" +url="http://www.gnu.org/software/jwhois/" +license="GPL" +depends= +makedepends="libiconv-dev autoconf automake libtool" +install= +subpackages="$pkgname-doc" +source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + jwhois-libiconv.patch" +arch="all" + +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd "$_builddir" + patch -p1 < "$srcdir/jwhois-libiconv.patch" + autoreconf +} + +build() { + cd "$_builddir" + ./configure --prefix=/ \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-nls \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install +} + +md5sums="977d0ba90ee058a7998c94d933fc9546 jwhois-4.0.tar.gz +f861d1891a718f3b370e1ac032b0b337 jwhois-libiconv.patch" diff --git a/main/jwhois/jwhois-libiconv.patch b/main/jwhois/jwhois-libiconv.patch new file mode 100644 index 0000000000..31c54bdf45 --- /dev/null +++ b/main/jwhois/jwhois-libiconv.patch @@ -0,0 +1,10 @@ +--- jwhois-4.0/src/Makefile.am ++++ jwhois-4.0.mod/src/Makefile.am +@@ -23,6 +23,7 @@ + getopt.c getopt1.c jconfig.c string.c cache.c rwhois.c jwhois.c \ + whois.c http.c + ++LIBS += @LIBICONV@ + jwhois_LIBS = @LIBINTL@ @LIBICONV@ @LIBS@ + + jwhois_CFLAGS = $(OLDCFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" \ diff --git a/testing/jwhois/APKBUILD b/testing/jwhois/APKBUILD deleted file mode 100644 index d2fbc460c0..0000000000 --- a/testing/jwhois/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: William Pitcock -pkgname=jwhois -pkgver=4.0 -pkgrel=1 -pkgdesc="WHOIS/RWHOIS client" -url="http://www.gnu.org/software/jwhois/" -license="GPL" -depends= -makedepends="libiconv-dev autoconf automake libtool" -install= -subpackages="$pkgname-doc" -source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz - jwhois-libiconv.patch" -arch="all" - -_builddir="$srcdir/$pkgname-$pkgver" - -prepare() { - cd "$_builddir" - patch -p1 < "$srcdir/jwhois-libiconv.patch" - autoreconf -} - -build() { - cd "$_builddir" - ./configure --prefix=/ \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-nls \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install -} - -md5sums="977d0ba90ee058a7998c94d933fc9546 jwhois-4.0.tar.gz -f861d1891a718f3b370e1ac032b0b337 jwhois-libiconv.patch" diff --git a/testing/jwhois/jwhois-libiconv.patch b/testing/jwhois/jwhois-libiconv.patch deleted file mode 100644 index 31c54bdf45..0000000000 --- a/testing/jwhois/jwhois-libiconv.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- jwhois-4.0/src/Makefile.am -+++ jwhois-4.0.mod/src/Makefile.am -@@ -23,6 +23,7 @@ - getopt.c getopt1.c jconfig.c string.c cache.c rwhois.c jwhois.c \ - whois.c http.c - -+LIBS += @LIBICONV@ - jwhois_LIBS = @LIBINTL@ @LIBICONV@ @LIBS@ - - jwhois_CFLAGS = $(OLDCFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" \ -- cgit v1.2.3