diff options
| author | marino <marino@pkgsrc.org> | 2012-05-27 18:13:59 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-05-27 18:13:59 +0000 |
| commit | f3342ec6b724bd76022e45f1742aaadfcfb0a244 (patch) | |
| tree | 63046d1ad54980f6d97a7e5fcc46e947110e2ce4 | |
| parent | aa679fe35462f83c01cb9a98eca9853f99fe8994 (diff) | |
| download | pkgsrc-f3342ec6b724bd76022e45f1742aaadfcfb0a244.tar.gz | |
wm/wmii: Fully implement DESTDIR
DESTDIR support was not complete for this package. Attempts to create /usr/pkg/include and
/usr/pkg/lib directory were being made. This was discovered while trying to build under a
non-root user. After updating patch-aa, a non-root user can install this package without issue.
| -rw-r--r-- | wm/wmii/distinfo | 4 | ||||
| -rw-r--r-- | wm/wmii/patches/patch-aa | 26 |
2 files changed, 22 insertions, 8 deletions
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo index 3d95273da12..d7525468070 100644 --- a/wm/wmii/distinfo +++ b/wm/wmii/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2010/02/12 20:42:33 joerg Exp $ +$NetBSD: distinfo,v 1.11 2012/05/27 18:13:59 marino 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) = 51f86a9517527effda87dce33e0996abc2bb5ddc +SHA1 (patch-aa) = d773336dc54d07c634b27fbc9a1660fff1589e7e SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7 SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31 diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa index 8ad8a15808b..37d9b157ab8 100644 --- a/wm/wmii/patches/patch-aa +++ b/wm/wmii/patches/patch-aa @@ -1,21 +1,25 @@ -$NetBSD: patch-aa,v 1.7 2010/02/12 20:42:33 joerg Exp $ +$NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $ ---- config.mk.orig 2007-11-16 14:59:15.000000000 +0100 +--- config.mk.orig 2007-11-16 13:59:15.000000000 +0000 +++ config.mk -@@ -1,10 +1,9 @@ +@@ -1,12 +1,11 @@ # Customize below to fit your system # paths -PREFIX = /usr/local -BIN = ${PREFIX}/bin -+BIN = ${DESTDIR}${PREFIX}/bin -MAN = ${PREFIX}/share/man -ETC = ${PREFIX}/etc +-LIBDIR = ${PREFIX}/lib +-INCLUDE = ${PREFIX}/include ++BIN = ${DESTDIR}${PREFIX}/bin +MAN = ${DESTDIR}${PREFIX}/${PKGMANDIR} +ETC = ${DESTDIR}${PKG_SYSCONFBASE} - LIBDIR = ${PREFIX}/lib - INCLUDE = ${PREFIX}/include ++LIBDIR = ${DESTDIR}${PREFIX}/lib ++INCLUDE = ${DESTDIR}${PREFIX}/include + # Includes and libs + INCPATH = .:${ROOT}/include:${INCLUDE}:/usr/include @@ -14,8 +13,8 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib # Flags @@ -27,3 +31,13 @@ $NetBSD: patch-aa,v 1.7 2010/02/12 20:42:33 joerg Exp $ STATIC = -static MKDEP = cpp -M +@@ -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) +-LIBIXP = ${ROOT}/libixp/libixp.a +-LIBIXP = ${LIBDIR}/libixp.a ++LIBIXP = ${PREFIX}/lib/libixp.a + + # Solaris + #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |