summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2005-06-02 22:08:29 +0000
committertron <tron@pkgsrc.org>2005-06-02 22:08:29 +0000
commit75c7b29eb7f0c38c25c5161a4f7218e59645fca9 (patch)
treef14975bbae0208bc3a6df0fab6c302053bb39186 /chat
parentf91dd9c279510ad2a905ea93b66019c7945fc001 (diff)
downloadpkgsrc-75c7b29eb7f0c38c25c5161a4f7218e59645fca9.tar.gz
- 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 (limited to 'chat')
-rw-r--r--chat/xchat2/Makefile29
-rw-r--r--chat/xchat2/Makefile.common19
2 files changed, 18 insertions, 30 deletions
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 22f88ff5116..175c98d9572 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.43 2005/06/02 22:08:29 tron Exp $
-.include "Makefile.common"
+DISTNAME= xchat-2.4.1
+PKGREVISION= 1
+CATEGORIES= chat gnome
+MASTER_SITES= http://www.xchat.org/files/source/2.4/
+EXTRACT_SUFX= .tar.bz2
-PKGREVISION= 1
-
-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
+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 @@ LDFLAGS.Darwin+= -lX11
.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 --git a/chat/xchat2/Makefile.common b/chat/xchat2/Makefile.common
deleted file mode 100644
index beb26c1884e..00000000000
--- a/chat/xchat2/Makefile.common
+++ /dev/null
@@ -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
-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"