[pkgsrc/trunk]: pkgsrc/chat/xchat2 - Merge "Makefile.common" (which isn't use...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca9f94195ee2
branches:  trunk
changeset: 495128:ca9f94195ee2
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Jun 02 22:08:29 2005 +0000

description:
- Merge "Makefile.common" (which isn't used anywhere except within this
  package) into "Makefile".
- Don't include "pkgsrc/devel/glib2/buidlink3.mk" because the package
  inherits that dependence automatically from the "gtk2+" package.

diffstat:

 chat/xchat2/Makefile        |  29 ++++++++++++++++++-----------
 chat/xchat2/Makefile.common |  19 -------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diffs (76 lines):

diff -r f1aeff891544 -r ca9f94195ee2 chat/xchat2/Makefile
--- a/chat/xchat2/Makefile      Thu Jun 02 21:55:05 2005 +0000
+++ b/chat/xchat2/Makefile      Thu Jun 02 22:08:29 2005 +0000
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $
-#
-
-.include "Makefile.common"
+# $NetBSD: Makefile,v 1.43 2005/06/02 22:08:29 tron Exp $
 
-PKGREVISION=   1
+DISTNAME=              xchat-2.4.1
+PKGREVISION=           1
+CATEGORIES=            chat gnome
+MASTER_SITES=          http://www.xchat.org/files/source/2.4/
+EXTRACT_SUFX=          .tar.bz2
 
-COMMENT=       X11 (X Window System) IRC client, using the GTK2 toolkit
-
-PATCH_DIST_STRIP=      -p1
 PATCH_SITES=           ${MASTER_SITES:=patches/}
 PATCHFILES=            xc241-fix-fetext.diff
+PATCH_DIST_STRIP=      -p1
+
+MAINTAINER=            minskim%NetBSD.org@localhost
+HOMEPAGE=              http://www.xchat.org/
+COMMENT=               X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=     YES
 
 CONFLICTS=             xchat-gnome-[0-9]*
 
+GNU_CONFIGURE=         YES
+USE_LIBTOOL=           YES
+USE_TOOLS+=            gmake
+
 USE_DIRS+=             xdg-1.1
 USE_PKGLOCALEDIR=      YES
 
@@ -29,10 +36,10 @@
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/xchat/plugins
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f1aeff891544 -r ca9f94195ee2 chat/xchat2/Makefile.common
--- a/chat/xchat2/Makefile.common       Thu Jun 02 21:55:05 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:43 jlam Exp $
-#
-
-DISTNAME=      xchat-2.4.1
-CATEGORIES=    chat gnome
-MASTER_SITES=  http://www.xchat.org/files/source/2.4/
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    minskim%NetBSD.org@localhost
-HOMEPAGE=      http://www.xchat.org/
-
-DISTINFO_FILE= ${.CURDIR}/../../chat/xchat2/distinfo
-
-GNU_CONFIGURE=         YES
-USE_LIBTOOL=           YES
-USE_TOOLS+=            gmake
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"