diff options
| author | jperkin <jperkin> | 2013-05-21 14:59:25 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-05-21 14:59:25 +0000 |
| commit | ab7ec5b8115c4020c474f4ea00a810155ce8bea6 (patch) | |
| tree | 63a358d381897b180d59f4145428bec6388b9f1f /wm | |
| parent | e7f67edfe811c76adfcd2707d1ad6242245187a8 (diff) | |
| download | pkgsrc-ab7ec5b8115c4020c474f4ea00a810155ce8bea6.tar.gz | |
Fix non-SunOS build.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/wmii/Makefile | 4 | ||||
| -rw-r--r-- | wm/wmii/distinfo | 4 | ||||
| -rw-r--r-- | wm/wmii/patches/patch-aa | 10 |
3 files changed, 7 insertions, 11 deletions
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile index dec12448b9f..37ebfbff912 100644 --- a/wm/wmii/Makefile +++ b/wm/wmii/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/05/20 09:04:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2013/05/21 14:59:25 jperkin Exp $ DISTNAME= wmii-3.6 PKGREVISION= 4 @@ -33,6 +33,8 @@ CONF_FILES_MODE= 0755 CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor +LDFLAGS.SunOS+= -lsocket -lnsl + SUBST_CLASSES+= vars SUBST_STAGE.vars= pre-build SUBST_FILES.vars= util/compile diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo index 0def53b6781..6257db76e2a 100644 --- a/wm/wmii/distinfo +++ b/wm/wmii/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2013/05/20 09:04:44 jperkin Exp $ +$NetBSD: distinfo,v 1.13 2013/05/21 14:59:25 jperkin Exp $ SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3 RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52 Size (wmii-3.6.tar.gz) = 208249 bytes -SHA1 (patch-aa) = 2f034052a301d031d38692bb86acc055918db462 +SHA1 (patch-aa) = a02c6e62e2cd47424fb6591f7991ef1d90159dcf SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7 SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31 SHA1 (patch-util_compile) = f6435bfa38bed3a8d897289ef2e0afeb793c5640 diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa index 6ed7d7fd181..37c5edd3dd7 100644 --- a/wm/wmii/patches/patch-aa +++ b/wm/wmii/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 2013/05/20 09:04:44 jperkin Exp $ +$NetBSD: patch-aa,v 1.10 2013/05/21 14:59:25 jperkin Exp $ --- config.mk.orig 2007-11-16 13:59:15.000000000 +0000 +++ config.mk @@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.9 2013/05/20 09:04:44 jperkin Exp $ MKDEP = cpp -M # Compiler -@@ -32,13 +31,12 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u +@@ -32,8 +31,7 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u INCX11 = -I/usr/X11R6/include LIBX11 = -L/usr/X11R6/lib -lX11 LIBICONV = # Leave blank if your libc includes iconv (glibc does) @@ -43,9 +43,3 @@ $NetBSD: patch-aa,v 1.9 2013/05/20 09:04:44 jperkin Exp $ # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} -R${PREFIX}/lib --#LDFLAGS += -lsocket -lnsl -+LDFLAGS += -lsocket -lnsl - #CFLAGS += -xtarget=ultra - - |