Thu Sep 8 20:59:13 2011 UTC ()
PR/36803 -- remove stray '&'.  Thanks to Jukka Salmi for noticing this.


(shattered)
diff -r1.26 -r1.27 pkgsrc/sysutils/gkrellm-server/Makefile
cvs diff -r1.26 -r1.27 pkgsrc/sysutils/gkrellm-server/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gkrellm-server/Makefile 2011/07/30 10:47:54 1.26
+++ pkgsrc/sysutils/gkrellm-server/Makefile 2011/09/08 20:59:13 1.27
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.26 2011/07/30 10:47:54 shattered Exp $ 1# $NetBSD: Makefile,v 1.27 2011/09/08 20:59:13 shattered Exp $
2 2
3.include "../../sysutils/gkrellm/Makefile.common" 3.include "../../sysutils/gkrellm/Makefile.common"
4 4
5GKRELLM_PKGBASE= gkrellm-server 5GKRELLM_PKGBASE= gkrellm-server
6PKGREVISION= 1 6PKGREVISION= 2
7COMMENT= Monitoring daemon remotely accessible by a GKrellM client 7COMMENT= Monitoring daemon remotely accessible by a GKrellM client
8DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share 8DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12USE_TOOLS+= pkg-config 12USE_TOOLS+= pkg-config
13PTHREAD_OPTS+= require 13PTHREAD_OPTS+= require
14RCD_SCRIPTS= gkrellmd 14RCD_SCRIPTS= gkrellmd
15EGDIR= ${PREFIX}/share/examples/gkrellm-server 15EGDIR= ${PREFIX}/share/examples/gkrellm-server
16CONF_FILES= ${EGDIR}/gkrellmd.conf ${PKG_SYSCONFDIR}/gkrellmd.conf 16CONF_FILES= ${EGDIR}/gkrellmd.conf ${PKG_SYSCONFDIR}/gkrellmd.conf
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
@@ -24,27 +24,27 @@ SPECIAL_PERMS+= ${PREFIX:Q}/bin/gkrellm @@ -24,27 +24,27 @@ SPECIAL_PERMS+= ${PREFIX:Q}/bin/gkrellm
24NOT_FOR_PLATFORM= IRIX-*-* 24NOT_FOR_PLATFORM= IRIX-*-*
25 25
26MAKE_ENV+= MODULES=server 26MAKE_ENV+= MODULES=server
27INSTALL_MAKE_FLAGS+= BINOWNER=${BINOWN:Q} BINGROUP=${BINGRP:Q} 27INSTALL_MAKE_FLAGS+= BINOWNER=${BINOWN:Q} BINGROUP=${BINGRP:Q}
28 28
29PKG_OPTIONS_VAR= PKG_OPTIONS.gkrellm-server 29PKG_OPTIONS_VAR= PKG_OPTIONS.gkrellm-server
30PKG_SUPPORTED_OPTIONS= glib1 30PKG_SUPPORTED_OPTIONS= glib1
31 31
32.include "../../mk/bsd.options.mk" 32.include "../../mk/bsd.options.mk"
33 33
34SUBST_CLASSES+= gkprefix 34SUBST_CLASSES+= gkprefix
35SUBST_STAGE.gkprefix= post-patch 35SUBST_STAGE.gkprefix= post-patch
36SUBST_FILES.gkprefix= server/gkrellmd.h 36SUBST_FILES.gkprefix= server/gkrellmd.h
37SUBST_SED.gkprefix= -e '/GKRELLMD_SYS_ETC/{s!/etc!${PKG_SYSCONFDIR}&!;}' 37SUBST_SED.gkprefix= -e '/GKRELLMD_SYS_ETC/{s!/etc!${PKG_SYSCONFDIR}!;}'
38 38
39post-install: 39post-install:
40 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/gkrellm-server 40 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/gkrellm-server
41 ${INSTALL_DATA} ${WRKSRC:Q}/server/gkrellmd.conf ${DESTDIR}${PREFIX:Q}/share/examples/gkrellm-server 41 ${INSTALL_DATA} ${WRKSRC:Q}/server/gkrellmd.conf ${DESTDIR}${PREFIX:Q}/share/examples/gkrellm-server
42 42
43.if !empty(PKG_OPTIONS:Mglib1) 43.if !empty(PKG_OPTIONS:Mglib1)
44MAKE_ENV+= USE_GLIB12=yes 44MAKE_ENV+= USE_GLIB12=yes
45.include "../../devel/glib/buildlink3.mk" 45.include "../../devel/glib/buildlink3.mk"
46.else 46.else
47.include "../../devel/glib2/buildlink3.mk" 47.include "../../devel/glib2/buildlink3.mk"
48.endif 48.endif
49.include "../../mk/pthread.buildlink3.mk" 49.include "../../mk/pthread.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"