[pkgsrc/trunk]: pkgsrc/net/ytalk Merge Makefile.common into Makefile (not nee...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37d393a23add
branches:  trunk
changeset: 506184:37d393a23add
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 12 20:03:52 2006 +0000

description:
Merge Makefile.common into Makefile (not needed any longer
now that ytalk-x11 package is gone).

diffstat:

 net/ytalk/Makefile        |  20 +++++++++++++++-----
 net/ytalk/Makefile.common |  18 ------------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diffs (52 lines):

diff -r 3f9cd849f59d -r 37d393a23add net/ytalk/Makefile
--- a/net/ytalk/Makefile        Thu Jan 12 19:59:20 2006 +0000
+++ b/net/ytalk/Makefile        Thu Jan 12 20:03:52 2006 +0000
@@ -1,11 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2006/01/12 19:57:00 wiz Exp $
-
-.include "../../net/ytalk/Makefile.common"
+# $NetBSD: Makefile,v 1.13 2006/01/12 20:03:52 wiz Exp $
 
-COMMENT=       Multi-user replacement for UNIX talk
+DISTNAME=       ytalk-3.3.0
+CATEGORIES=    net
+MASTER_SITES=   http://www.impul.se/ytalk/
 
-CONFIGURE_ARGS+=--without-x
+MAINTAINER=    mike%ethmoid.org@localhost
+HOMEPAGE=      http://www.impul.se/ytalk/index.php
+COMMENT=       Multi-user replacement for UNIX talk
 
 CONFLICTS+=    ytalk-x11-[0-9]*
 
+GNU_CONFIGURE= yes
+
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+EGDIR=         ${PREFIX}/share/examples/ytalk
+CONF_FILES=    ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc
+
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3f9cd849f59d -r 37d393a23add net/ytalk/Makefile.common
--- a/net/ytalk/Makefile.common Thu Jan 12 19:59:20 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2006/01/12 19:57:00 wiz Exp $
-
-DISTNAME=       ytalk-3.3.0
-CATEGORIES=    net
-MASTER_SITES=   http://www.impul.se/ytalk/
-
-MAINTAINER=    mike%ethmoid.org@localhost
-HOMEPAGE=      http://www.impul.se/ytalk/index.php
-COMMENT=       Multi-user replacement for UNIX talk
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR=         ${PREFIX}/share/examples/ytalk
-CONF_FILES=    ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc
-
-.include "../../mk/curses.buildlink3.mk"