Sat Sep 12 23:00:08 2015 UTC ()
Fix make syntax.


(joerg)
diff -r1.36 -r1.37 pkgsrc/net/netdisco/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/net/netdisco/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netdisco/Makefile 2015/09/09 08:35:51 1.36
+++ pkgsrc/net/netdisco/Makefile 2015/09/12 23:00:08 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2015/09/09 08:35:51 hauke Exp $ 1# $NetBSD: Makefile,v 1.37 2015/09/12 23:00:08 joerg Exp $
2 2
3DISTNAME= netdisco-${PKGVERSION}_with_mibs 3DISTNAME= netdisco-${PKGVERSION}_with_mibs
4PKGNAME= netdisco-${PKGVERSION} 4PKGNAME= netdisco-${PKGVERSION}
5PKGVERSION= 1.3.3 5PKGVERSION= 1.3.3
6#PKGREVISION= 1 6#PKGREVISION= 1
7CATEGORIES= net 7CATEGORIES= net
8DISTFILES= ${DEFAULT_DISTFILES} oui.txt 8DISTFILES= ${DEFAULT_DISTFILES} oui.txt
9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netdisco/} 9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netdisco/}
10SITES.oui.txt= http://standards.ieee.org/regauth/oui/ 10SITES.oui.txt= http://standards.ieee.org/regauth/oui/
11 11
12MAINTAINER= bouyer@NetBSD.org 12MAINTAINER= bouyer@NetBSD.org
13HOMEPAGE= http://www.netdisco.org/ 13HOMEPAGE= http://www.netdisco.org/
14COMMENT= Open Source web-based network management tool 14COMMENT= Open Source web-based network management tool
@@ -110,27 +110,27 @@ CONF_FILES_PERMS+= ${EGDIR:Q}/netdisco.c @@ -110,27 +110,27 @@ CONF_FILES_PERMS+= ${EGDIR:Q}/netdisco.c
110 ${NETDISCOUSER} ${NETDISCOGROUP} 0660 110 ${NETDISCOUSER} ${NETDISCOGROUP} 0660
111CONF_FILES+= ${EGDIR:Q}/netdisco-topology.txt ${PKG_SYSCONFDIR:Q}/netdisco-topology.txt 111CONF_FILES+= ${EGDIR:Q}/netdisco-topology.txt ${PKG_SYSCONFDIR:Q}/netdisco-topology.txt
112 112
113REQD_DIRS+= ${PREFIX:Q}/netdisco ${EGDIR:Q} 113REQD_DIRS+= ${PREFIX:Q}/netdisco ${EGDIR:Q}
114OWN_DIRS_PERMS+= ${VARBASE:Q}/netdisco ${NETDISCOUSER} ${NETDISCOGROUP} 0775 114OWN_DIRS_PERMS+= ${VARBASE:Q}/netdisco ${NETDISCOUSER} ${NETDISCOGROUP} 0775
115OWN_DIRS_PERMS+= ${PREFIX:Q}/netdisco/html ${NETDISCOUSER} ${NETDISCOGROUP} 0775 115OWN_DIRS_PERMS+= ${PREFIX:Q}/netdisco/html ${NETDISCOUSER} ${NETDISCOGROUP} 0775
116OWN_DIRS_PERMS+= ${PREFIX:Q}/netdisco/mason ${NETDISCOUSER} ${APACHE_GROUP} 0775 116OWN_DIRS_PERMS+= ${PREFIX:Q}/netdisco/mason ${NETDISCOUSER} ${APACHE_GROUP} 0775
117 117
118RCD_SCRIPTS= netdisco 118RCD_SCRIPTS= netdisco
119RCD_SCRIPT_SRC.netdisco= ${WRKSRC:Q}/bin/netdisco_daemon 119RCD_SCRIPT_SRC.netdisco= ${WRKSRC:Q}/bin/netdisco_daemon
120 120
121.include "../../mk/apache.mk" 121.include "../../mk/apache.mk"
122 122
123.if PKG_APACHE != apache22 123.if ${PKG_APACHE} != "apache22"
124SUBST_STAGE.apachevers= pre-configure 124SUBST_STAGE.apachevers= pre-configure
125SUBST_FILES.apachevers= html/admin_user.html html/change_pw.html html/login.html 125SUBST_FILES.apachevers= html/admin_user.html html/change_pw.html html/login.html
126SUBST_FILES.apachevers+= html/logout.html html/portcontrol.html 126SUBST_FILES.apachevers+= html/logout.html html/portcontrol.html
127SUBST_FILES.apachevers+= html/public_debugging.html 127SUBST_FILES.apachevers+= html/public_debugging.html
128SUBST_SED.apachevers= -e "s|connection->remote_ip|connection->client_ip|g" 128SUBST_SED.apachevers= -e "s|connection->remote_ip|connection->client_ip|g"
129SUBST_MESSAGE.apachevers= Fixing perl files for apache > 2.2. 129SUBST_MESSAGE.apachevers= Fixing perl files for apache > 2.2.
130.endif 130.endif
131 131
132do-build: 132do-build:
133 ${RM} -f ${WRKSRC:Q}/html/doc/ChangeLog.txt 133 ${RM} -f ${WRKSRC:Q}/html/doc/ChangeLog.txt
134 ${RM} -f ${WRKSRC:Q}/Makefile 134 ${RM} -f ${WRKSRC:Q}/Makefile
135 ${RM} -f ${WRKSRC:Q}/bin/debian_install.sh 135 ${RM} -f ${WRKSRC:Q}/bin/debian_install.sh
136 set -e; \ 136 set -e; \