summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/gsharutils/Makefile13
-rw-r--r--archivers/gsharutils/PLIST4
-rw-r--r--devel/diffutils/Makefile17
-rw-r--r--devel/diffutils/PLIST6
4 files changed, 22 insertions, 18 deletions
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 3450b8c575f..de46430da35 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2012/05/29 20:52:55 cheusov Exp $
+# $NetBSD: Makefile,v 1.47 2012/06/02 08:26:45 cheusov Exp $
DISTNAME= sharutils-4.11.1
-PKGREVISION= 1
+PKGREVISION= 2
PKGNAME= g${DISTNAME}
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=sharutils/}
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v3
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
-INSTALLATION_DIRS= gnu/bin
+AUTO_MKDIRS= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -29,9 +29,10 @@ CONFIGURE_ENV+= SH=${TOOLS_SH}
CONFIGURE_ARGS+= --program-prefix=g
post-install:
- set -e; cd ${DESTDIR}${PREFIX}/gnu/bin; \
- ln -s ../../bin/gshar shar; \
- ln -s ../../bin/gunshar unshar
+.for f in shar unshar
+ ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
+ ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+.endfor
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gsharutils/PLIST b/archivers/gsharutils/PLIST
index df47af03e46..c939eaa56fb 100644
--- a/archivers/gsharutils/PLIST
+++ b/archivers/gsharutils/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2012/05/29 20:52:55 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/06/02 08:26:45 cheusov Exp $
bin/gshar
bin/gunshar
gnu/bin/shar
gnu/bin/unshar
+gnu/man/man1/shar.1
+gnu/man/man1/unshar.1
info/sharutils.info
man/man1/gshar.1
man/man1/gunshar.1
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 4c3610b6c90..3279452e2c4 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2012/05/29 21:01:25 cheusov Exp $
+# $NetBSD: Makefile,v 1.28 2012/06/02 08:18:35 cheusov Exp $
#
DISTNAME= diffutils-3.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/}
@@ -25,16 +25,13 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
CONFIGURE_ENV+= ac_cv_sys_xsi_stack_overflow_heuristic=no
.endif
-PROGS= cmp diff diff3 sdiff
-
-INSTALLATION_DIRS+= gnu/bin
+AUTO_MKDIRS= yes
post-install:
- set -e; \
- cd ${DESTDIR}${PREFIX}/gnu/bin; \
- for p in ${PROGS}; do \
- ln -f -s "../../bin/g$${p}" "$${p}"; \
- done
+.for f in cmp diff diff3 sdiff
+ ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
+ ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
+.endfor
CONFIGURE_ARGS+= --program-prefix=g
diff --git a/devel/diffutils/PLIST b/devel/diffutils/PLIST
index 46a8796b6b9..ac891ba6ed1 100644
--- a/devel/diffutils/PLIST
+++ b/devel/diffutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/05/29 21:01:25 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/06/02 08:18:35 cheusov Exp $
bin/gcmp
bin/gdiff
bin/gdiff3
@@ -7,6 +7,10 @@ gnu/bin/cmp
gnu/bin/diff
gnu/bin/diff3
gnu/bin/sdiff
+gnu/man/man1/cmp.1
+gnu/man/man1/diff.1
+gnu/man/man1/diff3.1
+gnu/man/man1/sdiff.1
info/diffutils.info
man/man1/gcmp.1
man/man1/gdiff.1