de-lint

6 files changed, 14 insertions, 23 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index b17e5586152..1bdce00a507 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/28 12:13:33 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/04 14:01:01 tnn Exp $
 #
 
 PKGNAME=	finch-${VERSION}
@@ -31,7 +31,7 @@ BUILD_DIRS=finch
 pre-build:
 	# XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
-	  ${LN} -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
+	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 post-install:
 	${INSTALL_MAN_DIR} ${DESTDIR:Q}${PREFIX:Q}/man/man1
diff --git a/chat/finch/options.mk b/chat/finch/options.mk
index 587ac60ed71..7fe4382694c 100644
--- a/chat/finch/options.mk
+++ b/chat/finch/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/07/28 12:13:33 gdt Exp $
+# $NetBSD: options.mk,v 1.2 2007/08/04 14:01:01 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.finch
 PKG_SUPPORTED_OPTIONS+=		gstreamer debug
@@ -9,11 +9,11 @@ PKG_SUGGESTED_OPTIONS+=
 .if !empty(PKG_OPTIONS:Mgstreamer)
 .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=        --disable-gstreamer
+CONFIGURE_ARGS+=	--disable-gstreamer
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
+CONFIGURE_ARGS+=	--enable-debug
 .else
-CONFIGURE_ARGS+= --disable-debug
+CONFIGURE_ARGS+=	--disable-debug
 .endif
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 78a5a105545..3333182641f 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2007/07/28 12:32:17 gdt Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/08/04 14:01:52 tnn Exp $
 #
 
 VERSION=	2.0.1
@@ -14,8 +14,7 @@ COMMENT=	Multi-protocol Instant Messaging client GTK frontend
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config gmake perl:run
-USE_LANGUAGES+=		c
 USE_PKGLOCALEDIR=	yes
 
-PATCHDIR=               ${.CURDIR}/../../chat/libpurple/patches
+PATCHDIR=		${.CURDIR}/../../chat/libpurple/patches
 DISTINFO_FILE?=		${.CURDIR}/../../chat/libpurple/distinfo
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 4ff9d93883d..ec90c22e307 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/28 12:12:33 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/04 14:01:38 tnn Exp $
 #
 
 PKGNAME=		pidgin-${VERSION}
@@ -7,7 +7,7 @@ PKGREVISION=		1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include		"../../chat/libpurple/Makefile.common"  
+.include		"../../chat/libpurple/Makefile.common"
 
 USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		msgfmt
@@ -30,7 +30,7 @@ CHECK_WRKREF_SKIP=	bin/pidgin
 pre-build:
 	# XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
-	  ${LN} -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
+	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index 2e84f5d9928..15814f1e6ff 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/07/28 12:32:17 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/08/04 14:01:38 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PIDGIN_BUILDLINK3_MK:=	${PIDGIN_BUILDLINK3_MK}+
@@ -17,12 +17,5 @@ BUILDLINK_PKGSRCDIR.pidgin?=	../../chat/pidgin
 .endif	# PIDGIN_BUILDLINK3_MK
 
 .include "../../chat/libpurple/buildlink3.mk"
-#.include "../../devel/glib2/buildlink3.mk"
-#.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-#.include "../../textproc/libxml2/buildlink3.mk"
-#.include "../../x11/gtk2/buildlink3.mk"
-#.include "../../x11/libSM/buildlink3.mk"
-#.include "../../x11/libXScrnSaver/buildlink3.mk"
-#.include "../../x11/startup-notification/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index f4e0cab88e5..4acda327b3e 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/07/28 12:12:33 gdt Exp $
+# $NetBSD: options.mk,v 1.2 2007/08/04 14:01:38 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
 PKG_SUPPORTED_OPTIONS+=		gtkspell gstreamer debug
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-gtkspell
 .if !empty(PKG_OPTIONS:Mgstreamer)
 .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=        --disable-gstreamer
+CONFIGURE_ARGS+=	--disable-gstreamer
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
@@ -23,4 +23,3 @@ CONFIGURE_ARGS+= --enable-debug
 .else
 CONFIGURE_ARGS+= --disable-debug
 .endif
-