Tue May 21 14:59:25 2013 UTC ()
Fix non-SunOS build.


(jperkin)
diff -r1.27 -r1.28 pkgsrc/wm/wmii/Makefile
diff -r1.12 -r1.13 pkgsrc/wm/wmii/distinfo
diff -r1.9 -r1.10 pkgsrc/wm/wmii/patches/patch-aa
cvs diff -r1.27 -r1.28 pkgsrc/wm/wmii/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/wmii/Makefile 2013/05/20 09:04:44 1.27
+++ pkgsrc/wm/wmii/Makefile 2013/05/21 14:59:25 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2013/05/20 09:04:44 jperkin Exp $ 1# $NetBSD: Makefile,v 1.28 2013/05/21 14:59:25 jperkin Exp $
2 2
3DISTNAME= wmii-3.6 3DISTNAME= wmii-3.6
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= wm 5CATEGORIES= wm
6MASTER_SITES= http://code.suckless.org/dl/wmii/ 6MASTER_SITES= http://code.suckless.org/dl/wmii/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://wmii.suckless.org/ 9HOMEPAGE= http://wmii.suckless.org/
10COMMENT= Modular and keyboard-friendly window manager 10COMMENT= Modular and keyboard-friendly window manager
11 11
12DEPENDS+= dmenu>=3.7:../../x11/dmenu 12DEPENDS+= dmenu>=3.7:../../x11/dmenu
13 13
14USE_TOOLS+= tbl 14USE_TOOLS+= tbl
@@ -23,26 +23,28 @@ MAKE_JOBS_SAFE= no @@ -23,26 +23,28 @@ MAKE_JOBS_SAFE= no
23# see ${WRKSRC}/mk/wmii.mk 23# see ${WRKSRC}/mk/wmii.mk
24CONFVERSION= 3.5 24CONFVERSION= 3.5
25PLIST_SUBST+= CONFVERSION=${CONFVERSION} 25PLIST_SUBST+= CONFVERSION=${CONFVERSION}
26 26
27PKG_SYSCONFSUBDIR= wmii-${CONFVERSION} 27PKG_SYSCONFSUBDIR= wmii-${CONFVERSION}
28EGDIR= ${PREFIX}/share/examples/${PKG_SYSCONFSUBDIR} 28EGDIR= ${PREFIX}/share/examples/${PKG_SYSCONFSUBDIR}
29EGFILES= rc.wmii welcome wmiirc 29EGFILES= rc.wmii welcome wmiirc
30CONF_FILES_MODE= 0755 30CONF_FILES_MODE= 0755
31 31
32.for f in ${EGFILES} 32.for f in ${EGFILES}
33CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 33CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
34.endfor 34.endfor
35 35
 36LDFLAGS.SunOS+= -lsocket -lnsl
 37
36SUBST_CLASSES+= vars 38SUBST_CLASSES+= vars
37SUBST_STAGE.vars= pre-build 39SUBST_STAGE.vars= pre-build
38SUBST_FILES.vars= util/compile 40SUBST_FILES.vars= util/compile
39SUBST_VARS.vars= EGREP SED SH 41SUBST_VARS.vars= EGREP SED SH
40 42
41post-build: 43post-build:
42 mv ${WRKSRC}/man/wmii.1 ${WRKSRC}/man/wmii.tbl 44 mv ${WRKSRC}/man/wmii.1 ${WRKSRC}/man/wmii.tbl
43 ${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1 45 ${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1
44 46
45.include "../../devel/libixp/buildlink3.mk" 47.include "../../devel/libixp/buildlink3.mk"
46.include "../../x11/libX11/buildlink3.mk" 48.include "../../x11/libX11/buildlink3.mk"
47.include "../../x11/libXext/buildlink3.mk" 49.include "../../x11/libXext/buildlink3.mk"
48.include "../../x11/libXt/buildlink3.mk" 50.include "../../x11/libXt/buildlink3.mk"
cvs diff -r1.12 -r1.13 pkgsrc/wm/wmii/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/wmii/distinfo 2013/05/20 09:04:44 1.12
+++ pkgsrc/wm/wmii/distinfo 2013/05/21 14:59:25 1.13
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.12 2013/05/20 09:04:44 jperkin Exp $ 1$NetBSD: distinfo,v 1.13 2013/05/21 14:59:25 jperkin Exp $
2 2
3SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3 3SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3
4RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52 4RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52
5Size (wmii-3.6.tar.gz) = 208249 bytes 5Size (wmii-3.6.tar.gz) = 208249 bytes
6SHA1 (patch-aa) = 2f034052a301d031d38692bb86acc055918db462 6SHA1 (patch-aa) = a02c6e62e2cd47424fb6591f7991ef1d90159dcf
7SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7 7SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7
8SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31 8SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31
9SHA1 (patch-util_compile) = f6435bfa38bed3a8d897289ef2e0afeb793c5640 9SHA1 (patch-util_compile) = f6435bfa38bed3a8d897289ef2e0afeb793c5640
cvs diff -r1.9 -r1.10 pkgsrc/wm/wmii/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/wm/wmii/patches/patch-aa 2013/05/20 09:04:44 1.9
+++ pkgsrc/wm/wmii/patches/patch-aa 2013/05/21 14:59:25 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.9 2013/05/20 09:04:44 jperkin Exp $ 1$NetBSD: patch-aa,v 1.10 2013/05/21 14:59:25 jperkin Exp $
2 2
3--- config.mk.orig 2007-11-16 13:59:15.000000000 +0000 3--- config.mk.orig 2007-11-16 13:59:15.000000000 +0000
4+++ config.mk 4+++ config.mk
5@@ -1,12 +1,11 @@ 5@@ -1,12 +1,11 @@
6 # Customize below to fit your system 6 # Customize below to fit your system
7  7
8 # paths 8 # paths
9-PREFIX = /usr/local 9-PREFIX = /usr/local
10-BIN = ${PREFIX}/bin 10-BIN = ${PREFIX}/bin
11-MAN = ${PREFIX}/share/man 11-MAN = ${PREFIX}/share/man
12-ETC = ${PREFIX}/etc 12-ETC = ${PREFIX}/etc
13-LIBDIR = ${PREFIX}/lib 13-LIBDIR = ${PREFIX}/lib
14-INCLUDE = ${PREFIX}/include 14-INCLUDE = ${PREFIX}/include
@@ -23,29 +23,23 @@ $NetBSD: patch-aa,v 1.9 2013/05/20 09:04 @@ -23,29 +23,23 @@ $NetBSD: patch-aa,v 1.9 2013/05/20 09:04
23@@ -14,9 +13,9 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib 23@@ -14,9 +13,9 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib
24  24
25 # Flags 25 # Flags
26 include ${ROOT}/mk/gcc.mk 26 include ${ROOT}/mk/gcc.mk
27-CFLAGS += -g -O0 -DIXPlint 27-CFLAGS += -g -O0 -DIXPlint
28-LDFLAGS += -g ${LIBS} 28-LDFLAGS += -g ${LIBS}
29-STATIC = -static 29-STATIC = -static
30+CFLAGS += -DIXPlint 30+CFLAGS += -DIXPlint
31+LDFLAGS += ${LIBS} 31+LDFLAGS += ${LIBS}
32+#STATIC = -static 32+#STATIC = -static
33 MKDEP = cpp -M 33 MKDEP = cpp -M
34  34
35 # Compiler 35 # Compiler
36@@ -32,13 +31,12 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u 36@@ -32,8 +31,7 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u
37 INCX11 = -I/usr/X11R6/include 37 INCX11 = -I/usr/X11R6/include
38 LIBX11 = -L/usr/X11R6/lib -lX11 38 LIBX11 = -L/usr/X11R6/lib -lX11
39 LIBICONV = # Leave blank if your libc includes iconv (glibc does) 39 LIBICONV = # Leave blank if your libc includes iconv (glibc does)
40-LIBIXP = ${ROOT}/libixp/libixp.a 40-LIBIXP = ${ROOT}/libixp/libixp.a
41-LIBIXP = ${LIBDIR}/libixp.a 41-LIBIXP = ${LIBDIR}/libixp.a
42+LIBIXP = ${PREFIX}/lib/libixp.a 42+LIBIXP = ${PREFIX}/lib/libixp.a
43  43
44 # Solaris 44 # Solaris
45 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" 45 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
46 #LDFLAGS = ${LIBS} -R${PREFIX}/lib 
47-#LDFLAGS += -lsocket -lnsl 
48+LDFLAGS += -lsocket -lnsl 
49 #CFLAGS += -xtarget=ultra 
50  
51