pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/crossfire-cli Convert to buildlink3, drop superf...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/98e230a4d490
branches:  trunk
changeset: 472660:98e230a4d490
user:      snj <snj%pkgsrc.org@localhost>
date:      Sun Apr 11 19:04:44 2004 +0000

description:
Convert to buildlink3, drop superfluous DEPENDS, remove superfluous
SCRIPTS_ENV, don't bother explicitly including ${LOCALBASE}/include/,
pull in ossaudio.buildlink3.mk, link with ${LIBOSSAUDIO} and use
${DEVOSSAUDIO}.  Bump PKGREVISION.

XXX What is with those install and deinstall scripts?

diffstat:

 games/crossfire-cli/Makefile         |  24 +++++++++++++-----------
 games/crossfire-cli/distinfo         |   4 ++--
 games/crossfire-cli/patches/patch-ab |  18 ++++++++++++++----
 3 files changed, 29 insertions(+), 17 deletions(-)

diffs (104 lines):

diff -r 778fd2b3c0e8 -r 98e230a4d490 games/crossfire-cli/Makefile
--- a/games/crossfire-cli/Makefile      Sun Apr 11 19:02:40 2004 +0000
+++ b/games/crossfire-cli/Makefile      Sun Apr 11 19:04:44 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 13:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/11 19:04:44 snj Exp $
 #
 
 DISTNAME=      crossfire-client-1.0.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games x11
 MASTER_SITES=  ftp://ftp.ifi.uio.no/pub/crossfire/
 DISTFILES=     ${CF_SRC} ${CF_SND} ${CF_RAW}
@@ -11,26 +11,27 @@
 HOMEPAGE=      http://crossfire.real-time.com/
 COMMENT=       Client for X11 game similar to gauntlet and nethack
 
-DEPENDS+=      gtk+>=1.2.4:../../x11/gtk
-DEPENDS+=      png>=1.2.1:../../graphics/png
-
 EXTRACT_ONLY=  ${CF_SRC}
 
 CF_SRC=                crossfire-client-1.0.0.tar.gz
 CF_SND=                client-0.95.2-au-sounds.tgz
 CF_RAW=                client-0.95.2-raw-sounds.tgz
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 USE_PERL5=     yes
 USE_X11=       yes
 USE_GNU_TOOLS+=        make
 GNU_CONFIGURE= yes
-SCRIPTS_ENV+=  ${SCRIPTSDIR}
-CONFIGURE_ARGS+=       --with-includes=-I${LOCALBASE}/include
 CONFIGURE_ARGS+=       --with-sound-dir=${LOCALBASE}/share/cfclient/sounds
 
 REPLACE_PERL=  utils/deftoheader.pl items.pl
 
+SUBST_CLASSES+=                dsp
+SUBST_STAGE.dsp=       post-patch
+SUBST_MESSAGE.dsp=     Adjusting path to sound device.
+SUBST_FILES.dsp=       cfsndserv.c
+SUBST_SED.dsp=         -e "s|/dev/dsp|${DEVOSSAUDIO}|"
+
 pre-build:
        cd ${WRKSRC} && ${MAKE} soundsdef.h
 
@@ -43,7 +44,8 @@
        ${INSTALL_DATA} ${WRKSRC}/def_keys ${LOCALBASE}/share/cfclient
        @${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/cfclient
 
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 778fd2b3c0e8 -r 98e230a4d490 games/crossfire-cli/distinfo
--- a/games/crossfire-cli/distinfo      Sun Apr 11 19:02:40 2004 +0000
+++ b/games/crossfire-cli/distinfo      Sun Apr 11 19:04:44 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/07/19 00:24:02 garbled Exp $
+$NetBSD: distinfo,v 1.4 2004/04/11 19:04:44 snj Exp $
 
 SHA1 (crossfire-client-1.0.0.tar.gz) = d6861684a40884efe6411d413b9273fa52314236
 Size (crossfire-client-1.0.0.tar.gz) = 244723 bytes
@@ -7,4 +7,4 @@
 SHA1 (client-0.95.2-raw-sounds.tgz) = 61606356eb538198e8ad4ef0dc54b7ad048097af
 Size (client-0.95.2-raw-sounds.tgz) = 326199 bytes
 SHA1 (patch-aa) = 2b06d2b09e00b118b6e516102aa8860c72fc5094
-SHA1 (patch-ab) = d9afa5c52ef1f4a36d9cc9d347aec6d351413340
+SHA1 (patch-ab) = 27d4a550f4f630d9f19c6b81a7aa208a3580e8b1
diff -r 778fd2b3c0e8 -r 98e230a4d490 games/crossfire-cli/patches/patch-ab
--- a/games/crossfire-cli/patches/patch-ab      Sun Apr 11 19:02:40 2004 +0000
+++ b/games/crossfire-cli/patches/patch-ab      Sun Apr 11 19:04:44 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/07/19 00:24:02 garbled Exp $
---- Makefile.in.orig   Sun May 13 15:03:07 2001
-+++ Makefile.in        Wed Jul 18 16:42:13 2001
-@@ -4,7 +4,7 @@
+$NetBSD: patch-ab,v 1.3 2004/04/11 19:04:44 snj Exp $
+
+--- Makefile.in.orig   2001-05-13 15:03:07.000000000 -0700
++++ Makefile.in        2004-04-11 11:34:40.000000000 -0700
+@@ -4,7 +4,7 @@ CP = @CP@
  TAR = @TAR@
  RM = @RM@
  TARGET = @TARGET@
@@ -10,3 +11,12 @@
  LDFLAGS = @LDFLAGS@
  CC = @CC@
  LIBS = @LIBS@ @LIBXPM_LIB@ 
+@@ -50,7 +50,7 @@ X_LIBS=@X_LIBS@
+ 
+ GTK_CFLAGS=@GTK_CFLAGS@
+ GTK_LIBS=@GTK_LIBS@
+-SND_LIBS=@SND_LIBS@
++SND_LIBS=@SND_LIBS@ $(LIBOSSAUDIO)
+ 
+ # proto only wants the .c files 
+ 



Home | Main Index | Thread Index | Old Index