summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2011-05-28 09:07:38 +0000
committerobache <obache@pkgsrc.org>2011-05-28 09:07:38 +0000
commitbbe5899e3a4c21112567f0138234a677b093f918 (patch)
tree1d8a242620de2621e8cfa8249f68e5623bd75ceb
parent1e4cfc604ab3444079e7f20e18b59f8ed9d835cb (diff)
downloadpkgsrc-bbe5899e3a4c21112567f0138234a677b093f918.tar.gz
Add user-destdir installation support.
-rw-r--r--print/ja-vflib-lib/Makefile15
-rw-r--r--print/ja-vflib-lib/Makefile.common6
-rw-r--r--print/ja-vflib-utils/Makefile4
3 files changed, 15 insertions, 10 deletions
diff --git a/print/ja-vflib-lib/Makefile b/print/ja-vflib-lib/Makefile
index e7bc5f00565..f6f6a6f2078 100644
--- a/print/ja-vflib-lib/Makefile
+++ b/print/ja-vflib-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/04/22 13:42:12 obache Exp $
+# $NetBSD: Makefile,v 1.11 2011/05/28 09:07:38 obache Exp $
.include "Makefile.common"
@@ -7,7 +7,6 @@ PKGREVISION= 3
COMMENT= Japanese Vector font library
-CONFIGURE_ARGS+= --without-x
BUILD_TARGET= build-src
INSTALL_TARGET= install-src
@@ -23,15 +22,15 @@ post-build:
.endfor
post-install:
- ${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include
+ ${MV} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${DESTDIR}${PREFIX}/include
- ${INSTALL_DATA_DIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}
cd ${WRKSRC} && ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \
- ${PREFIX}/share/VFlib/${VFLIB_VERSION}
- cd ${WRKSRC} && pax -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION}
- ${FIND} ${PREFIX}/share/VFlib/${VFLIB_VERSION} -type d -print \
+ ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}
+ cd ${WRKSRC} && pax -rw jTeX ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}
+ ${FIND} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION} -type d -print \
-exec ${CHMOD} ${PKGDIRMODE} {} \;
- ${FIND} ${PREFIX}/share/VFlib/${VFLIB_VERSION} -type f -print \
+ ${FIND} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION} -type f -print \
-exec ${CHMOD} ${SHAREMODE} {} \;
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common
index 6e8d3a71e5a..a3974c8a585 100644
--- a/print/ja-vflib-lib/Makefile.common
+++ b/print/ja-vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2011/04/19 11:34:47 obache Exp $
+# $NetBSD: Makefile.common,v 1.13 2011/05/28 09:07:38 obache Exp $
#
# used by print/ja-vflib-lib/Makefile
# used by print/ja-vflib-utils/Makefile
@@ -13,6 +13,9 @@ VFLIB_SRC= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/
+PKG_DESTDIR_SUPPORT= user-destdir
+
+CONFIGURE_ARGS+= --without-x
VFLIB_VERSION= 2.24.2
PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION:Q}
PLIST_SUBST+= VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
@@ -28,6 +31,7 @@ CONFIGURE_ARGS+= --with-freetype=${FT_LIB:Q}
CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR:Q}
CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR:Q}
MAKE_ENV+= LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
+INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
DISTINFO_FILE= ${.CURDIR}/../../print/ja-vflib-lib/distinfo
PATCHDIR= ${.CURDIR}/../../print/ja-vflib-lib/patches
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index c60eeb600cd..e810ae2c743 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/04/22 13:44:32 obache Exp $
+# $NetBSD: Makefile,v 1.14 2011/05/28 09:07:38 obache Exp $
.include "../../print/ja-vflib-lib/Makefile.common"
@@ -15,6 +15,8 @@ USE_TOOLS+= xmkmf
BUILD_TARGET= build-tools
INSTALL_TARGET= install-tools
+INSTALLATION_DIRS+= bin
+
.include "../../print/ja-vflib-lib/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"