From 20ec8ab73baa16bc8c4461e655b72e7950fc8dc8 Mon Sep 17 00:00:00 2001 From: reinhard Date: Tue, 17 Apr 2001 10:44:03 +0000 Subject: [PATCH] update to nap-1.4.4-ps7 *) enable separate build, change version managing style *) remove pkg/MESSAGE and unneded patches *) better DESCR *) bump NEED_VERSION Brief Changelog: - After asking you for the needed information, nap now creates the .napconf file automatically. No sample distfile anymore. - Added some keybindings for the main window. - Fixed Ctrl-C so that it can break a nested loop; Ctrl-L so it really redraws the whole screen from scratch. from maintainer --- audio/nap/Makefile | 12 ++++---- audio/nap/files/md5 | 6 ++-- audio/nap/patches/patch-configure | 48 ------------------------------- audio/nap/pkg/DESCR | 7 +++-- audio/nap/pkg/MESSAGE | 3 -- audio/nap/pkg/PLIST | 4 +-- 6 files changed, 14 insertions(+), 66 deletions(-) delete mode 100644 audio/nap/patches/patch-configure delete mode 100644 audio/nap/pkg/MESSAGE diff --git a/audio/nap/Makefile b/audio/nap/Makefile index 1b98bf9c99c..79170b7d991 100644 --- a/audio/nap/Makefile +++ b/audio/nap/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.5 2001/04/10 17:26:01 reinhard Exp $ +# $OpenBSD: Makefile,v 1.6 2001/04/17 10:44:03 reinhard Exp $ COMMENT= 'gnu curses-based napster client' -VER= 1.4.4-ps4 -DISTNAME= nap-${VER} +KS= 1.4.4 +PS= ps7 +DISTNAME= nap-${KS}-${PS} CATEGORIES= audio -NEED_VERSION= 1.392 +NEED_VERSION= 1.397 HOMEPAGE= http://theory.stanford.edu/~selinger/nap/ @@ -18,12 +19,11 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} +SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nap ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nap ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nap - ${INSTALL_DATA} ${WRKSRC}/nap.conf.dist ${PREFIX}/share/examples/nap .include diff --git a/audio/nap/files/md5 b/audio/nap/files/md5 index 5e06dc27105..69b2779eeec 100644 --- a/audio/nap/files/md5 +++ b/audio/nap/files/md5 @@ -1,3 +1,3 @@ -MD5 (nap-1.4.4-ps4.tar.gz) = ed0e0aceaf7529fd6c9b97d9a03b17b6 -RMD160 (nap-1.4.4-ps4.tar.gz) = 7530a4b404f9aaac60211b51f7261ee8993b7528 -SHA1 (nap-1.4.4-ps4.tar.gz) = c84ec19dfcaae5aa5a9bb3128ac9ae1cd69a58c0 +MD5 (nap-1.4.4-ps7.tar.gz) = 61d287051d4f3129632b68817000ecdf +RMD160 (nap-1.4.4-ps7.tar.gz) = 8c353d7dc20358eab5a876a2d53c723e62ef8858 +SHA1 (nap-1.4.4-ps7.tar.gz) = 71b9a06811bddd33999b0869e2a364e1cf47453e diff --git a/audio/nap/patches/patch-configure b/audio/nap/patches/patch-configure deleted file mode 100644 index 60dbeb5b021..00000000000 --- a/audio/nap/patches/patch-configure +++ /dev/null @@ -1,48 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2001/04/04 10:53:47 reinhard Exp $ ---- configure.orig Wed Mar 28 10:50:06 2001 -+++ configure Wed Mar 28 10:50:26 2001 -@@ -604,44 +604,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 --echo "configure:609: checking whether build environment is sane" >&5 --# Just in case --sleep 1 --echo timestamp > conftestfile --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` -- if test "$*" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftestfile` -- fi -- if test "$*" != "X $srcdir/configure conftestfile" \ -- && test "$*" != "X conftestfile $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- { echo "configure: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" 1>&2; exit 1; } -- fi -- -- test "$2" = conftestfile -- ) --then -- # Ok. -- : --else -- { echo "configure: error: newly created file is older than distributed files! --Check your system clock" 1>&2; exit 1; } --fi --rm -f conftest* --echo "$ac_t""yes" 1>&6 - if test "$program_transform_name" = s,x,x,; then - program_transform_name= - else diff --git a/audio/nap/pkg/DESCR b/audio/nap/pkg/DESCR index 7a3ae3ddfb8..82161a176b0 100644 --- a/audio/nap/pkg/DESCR +++ b/audio/nap/pkg/DESCR @@ -3,13 +3,14 @@ originally written for windows. Napster is a great tool for exploring and experiencing artists and music you've never heard before, using protocol -for sharing MP3 files between users. With Napster, the files -stay on the user machine, never passing through the server. +for sharing MP3 files between users. With Napster, the +files stay on the user machine and never pass through the +server. The server has the ability to search for particular files, initializing direct transfer between the clients. The original author of nap is Kevin Sullivan, the 'ps' -releases are managed by Peter Selinger. +releases are maintained by Peter Selinger. WWW: ${HOMEPAGE} diff --git a/audio/nap/pkg/MESSAGE b/audio/nap/pkg/MESSAGE deleted file mode 100644 index dbfe50f5486..00000000000 --- a/audio/nap/pkg/MESSAGE +++ /dev/null @@ -1,3 +0,0 @@ -By default the configuration file .napconf must be in your -home directory. The program does not create this file. For -an example see: ${PREFIX}/share/examples/nap/nap.conf.dist diff --git a/audio/nap/pkg/PLIST b/audio/nap/pkg/PLIST index 0e3971d5492..f0c4dca5a1d 100644 --- a/audio/nap/pkg/PLIST +++ b/audio/nap/pkg/PLIST @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2001/02/04 18:55:33 reinhard Exp $ +@comment $OpenBSD: PLIST,v 1.2 2001/04/17 10:44:06 reinhard Exp $ bin/nap share/doc/nap/README -share/examples/nap/nap.conf.dist -@dirrm share/examples/nap @dirrm share/doc/nap