summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-07-07 17:38:09 +0000
committerjoerg <joerg@pkgsrc.org>2009-07-07 17:38:09 +0000
commit4a493f3219fcd51944da17a05381c4dc17e9464f (patch)
tree69a0098a66e0edb79a2672369956868d9a5ce3b8
parent604b12f81f30ddcd90a8f2241ff010262f513ecb (diff)
downloadpkgsrc-4a493f3219fcd51944da17a05381c4dc17e9464f.tar.gz
user-destdir support
-rw-r--r--textproc/ja-groff/Makefile8
-rw-r--r--x11/xhangglider/Makefile8
-rw-r--r--x11/xmindpath/Makefile8
-rw-r--r--x11/xmindpath/distinfo3
-rw-r--r--x11/xmindpath/patches/patch-ae15
-rw-r--r--x11/xvidcap-gtk2/Makefile4
-rw-r--r--x11/xvidcap/Makefile4
-rw-r--r--x11/xvidcap/distinfo4
-rw-r--r--x11/xvidcap/patches/patch-ae8
9 files changed, 46 insertions, 16 deletions
diff --git a/textproc/ja-groff/Makefile b/textproc/ja-groff/Makefile
index 17d78f07e66..5564c2590d6 100644
--- a/textproc/ja-groff/Makefile
+++ b/textproc/ja-groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/06/30 00:07:23 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/07 17:38:43 joerg Exp $
DISTNAME= groff-1.10
PKGNAME= ja-groff-0.99
@@ -15,6 +15,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/groff/groff.html
COMMENT= Japanese enhancement of GNU groff
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake perl:run
@@ -22,7 +24,9 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_HAS_MANDIR= no
#CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O"
-MAKE_FLAGS+= manroot=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+= manroot=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \
+ datadir=${DESTDIR}${PREFIX}/share
REPLACE_PERL= grog/grog.pl
REPLACE_PERL+= afmtodit/afmtodit.pl
diff --git a/x11/xhangglider/Makefile b/x11/xhangglider/Makefile
index e72ccadf981..d9369526001 100644
--- a/x11/xhangglider/Makefile
+++ b/x11/xhangglider/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:45 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/07 17:40:03 joerg Exp $
#
DISTNAME= xhangglider-0.94.0
@@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.netfort.gr.jp/~take/linux/xhang-en.html
COMMENT= Hanggliders fly in the background of the X screen
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_IMAKE= yes
PKGSRC_MAKE_ENV+= PREFIX=${PREFIX}
@@ -17,9 +19,7 @@ post-extract:
${RM} ${WRKSRC}/Makefile
${TOUCH} ${WRKSRC}/xhangglider.man
-do-install:
- cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} make install
- cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} make install.dat
+INSTALL_TARGET= install install.dat
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile
index 3d297a55ece..2cebad57197 100644
--- a/x11/xmindpath/Makefile
+++ b/x11/xmindpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/12 21:11:14 zafer Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/07 17:38:13 joerg Exp $
DISTNAME= magicpoint-1.09a
PKGNAME= xmindpath-1.09a
@@ -11,10 +11,16 @@ MASTER_SITES= ftp://ftp.riken.go.jp/pub/misc/Japan/MagicPoint/ \
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= MindPath PocketPoint user-level driver for X11
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/xmindpath
GNU_CONFIGURE= yes
USE_FEATURES= err
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+SPECIAL_PERMS= bin/xmindpath uucp ${REAL_ROOT_GROUP} 4511
+
+
.include "../../mk/bsd.prefs.mk"
.if !empty(MISSING_FEATURES:Merr)
diff --git a/x11/xmindpath/distinfo b/x11/xmindpath/distinfo
index 1a87fb218c1..a983b5a3e13 100644
--- a/x11/xmindpath/distinfo
+++ b/x11/xmindpath/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/10/01 11:02:44 rillig Exp $
+$NetBSD: distinfo,v 1.7 2009/07/07 17:38:13 joerg Exp $
SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f
RMD160 (magicpoint-1.09a.tar.gz) = 2ee96eed9c9e31d6c599447d421ae319483c3617
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 8566a9bbab0538509ea5a1b383d357b403f0860c
SHA1 (patch-ab) = 7d86596abcd15ce1fea3a7b71ee9254facbd371e
SHA1 (patch-ac) = ac6fadd92517a43d7f58e3c8ab888724a440b156
SHA1 (patch-ad) = 507022a52f6f3415678d56929d985f4f07fb9569
+SHA1 (patch-ae) = 630e2bb00a051b08fbb02ff6961f394845172740
diff --git a/x11/xmindpath/patches/patch-ae b/x11/xmindpath/patches/patch-ae
new file mode 100644
index 00000000000..130634ac6f6
--- /dev/null
+++ b/x11/xmindpath/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2009/07/07 17:38:13 joerg Exp $
+
+--- Makefile.in.orig 2009-07-07 19:27:30.000000000 +0200
++++ Makefile.in
+@@ -24,8 +24,8 @@ main.o: $(srcdir)/main.c
+ uucplock.o: $(srcdir)/uucplock.c
+
+ install::
+- $(INSTALL) -s -o uucp -g bin -m 4755 $(TARGET) $(bindir)
+- $(INSTALL) -o bin -g bin -m 444 $(TARGET).1 $(mandir)/man1
++ $(BSD_INSTALL_PROGRAM) $(TARGET) ${DESTDIR}$(bindir)
++ $(BSD_INSTALL_MAN) $(TARGET).1 ${DESTDIR}$(mandir)/man1
+
+ includes::
+
diff --git a/x11/xvidcap-gtk2/Makefile b/x11/xvidcap-gtk2/Makefile
index 2b314545fce..0dee25c4b6e 100644
--- a/x11/xvidcap-gtk2/Makefile
+++ b/x11/xvidcap-gtk2/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/05/17 01:53:18 reed Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/07 17:38:10 joerg Exp $
#
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../x11/xvidcap/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-gtk2-/}
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index 2272a8f943f..5d4d1646da0 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/09/08 15:14:21 ahoka Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/07 17:38:09 joerg Exp $
#
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "Makefile.common"
PKGREVISION= 7
diff --git a/x11/xvidcap/distinfo b/x11/xvidcap/distinfo
index 6dd6877446c..52186b3dc74 100644
--- a/x11/xvidcap/distinfo
+++ b/x11/xvidcap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/05/17 05:06:28 reed Exp $
+$NetBSD: distinfo,v 1.8 2009/07/07 17:38:09 joerg Exp $
SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = fd0a2640446f6e5ee2f1ca4d883e5d6878e69f1e
+SHA1 (patch-ae) = 2ebab45421ab2782d48067f7b63e010190111397
SHA1 (patch-af) = 7e5533775b68a2c2ade195660b859530e6422da4
SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
diff --git a/x11/xvidcap/patches/patch-ae b/x11/xvidcap/patches/patch-ae
index 431809ea9cb..a10afec27f6 100644
--- a/x11/xvidcap/patches/patch-ae
+++ b/x11/xvidcap/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2006/05/17 05:06:28 reed Exp $
+$NetBSD: patch-ae,v 1.4 2009/07/07 17:38:09 joerg Exp $
--- src/Makefile.in.orig 2004-02-14 12:06:20.000000000 -0800
+++ src/Makefile.in 2006-05-16 21:57:37.000000000 -0700
@@ -39,9 +39,9 @@ $NetBSD: patch-ae,v 1.3 2006/05/17 05:06:28 reed Exp $
- mkdir -p ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
- ./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
- cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
-+ mkdir -p ${docdir}
-+ cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${docdir}
-+@WITHGTK2_FALSE@ ./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
++ mkdir -p ${DESTDIR}${docdir}
++ cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${DESTDIR}${docdir}
++@WITHGTK2_FALSE@ ./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${DESTDIR}${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
uninstall-hook:
rm -rf ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}