diff options
author | wiz <wiz@pkgsrc.org> | 2006-01-12 20:03:52 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2006-01-12 20:03:52 +0000 |
commit | 0f3e1b1cd0673ad8e366f90d3fee4f0076828b45 (patch) | |
tree | 4e3374c24acad095b0bf5a356901ffbf4159a1e4 /net/ytalk | |
parent | 7703e98e98e2ca7fac7a02affbb460b37185aebd (diff) | |
download | pkgsrc-0f3e1b1cd0673ad8e366f90d3fee4f0076828b45.tar.gz |
Merge Makefile.common into Makefile (not needed any longer
now that ytalk-x11 package is gone).
Diffstat (limited to 'net/ytalk')
-rw-r--r-- | net/ytalk/Makefile | 18 | ||||
-rw-r--r-- | net/ytalk/Makefile.common | 18 |
2 files changed, 14 insertions, 22 deletions
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile index 56bf8bdd273..f7ed43928c3 100644 --- a/net/ytalk/Makefile +++ b/net/ytalk/Makefile @@ -1,11 +1,21 @@ -# $NetBSD: Makefile,v 1.12 2006/01/12 19:57:00 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/01/12 20:03:52 wiz Exp $ -.include "../../net/ytalk/Makefile.common" +DISTNAME= ytalk-3.3.0 +CATEGORIES= net +MASTER_SITES= http://www.impul.se/ytalk/ +MAINTAINER= mike@ethmoid.org +HOMEPAGE= http://www.impul.se/ytalk/index.php COMMENT= Multi-user replacement for UNIX talk -CONFIGURE_ARGS+=--without-x - 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 --git a/net/ytalk/Makefile.common b/net/ytalk/Makefile.common deleted file mode 100644 index 9420dd341f1..00000000000 --- a/net/ytalk/Makefile.common +++ /dev/null @@ -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 -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" |