summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comms/hylafax/Makefile14
-rw-r--r--comms/hylafax/distinfo4
-rw-r--r--comms/hylafax/patches/patch-af37
-rw-r--r--comms/qpage/Makefile10
-rw-r--r--comms/tkhylafax/Makefile6
-rw-r--r--comms/tkhylafax/distinfo4
-rw-r--r--comms/tkhylafax/patches/patch-aa8
-rw-r--r--converters/cn2jp/Makefile13
-rw-r--r--converters/cn2jp/distinfo4
-rw-r--r--converters/cn2jp/patches/patch-aa6
-rw-r--r--converters/ish/Makefile5
-rw-r--r--converters/ish/distinfo4
-rw-r--r--converters/ish/patches/patch-aa4
-rw-r--r--converters/odt2txt/Makefile8
-rw-r--r--converters/odt2txt/distinfo4
-rw-r--r--converters/odt2txt/patches/patch-aa32
16 files changed, 107 insertions, 56 deletions
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index ad7dbb92a2d..bfae15b087f 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/01/29 16:44:13 joerg Exp $
VERS= 4.2.5
DISTNAME= hylafax-${VERS}
@@ -8,6 +8,8 @@ MASTER_SITES_BETA= ftp://ftp.hylafax.org/source/BETA/
MASTER_SITES_RELEASE= ftp://ftp.hylafax.org/source/
MASTER_SITES= ${MASTER_SITES_RELEASE}
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAINTAINER= hallmann@ahatec.de
HOMEPAGE= http://www.hylafax.org/
COMMENT= Telecommunication and fax server system
@@ -38,8 +40,10 @@ MAKE_JOBS_SAFE= NO
INSTALLATION_DIRS= libdata/hylafax
-SUID_EXES= ${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \
- ${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
+SPECIAL_PERMS+= bin/faxalter ${SETUID_ROOT_PERMS} \
+ bin/faxrm ${SETUID_ROOT_PERMS} \
+ libexec/faxgetty ${SETUID_ROOT_PERMS} \
+ sbin/faxq ${SETUID_ROOT_PERMS}
PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax
PKG_SUPPORTED_OPTIONS= pam
@@ -59,10 +63,6 @@ CONFIGURE_ARGS+= --disable-pam
CONFIGURE_ENV+= MACHDEPLIBS=-lrt
.endif
-post-install:
- chown ${FAXUSER} ${SUID_EXES}
- chmod 4555 ${SUID_EXES}
-
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index 34d3a95fc4b..448e7d29f4a 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2009/08/27 17:09:55 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/01/29 16:44:13 joerg Exp $
SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc
RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7
SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
SHA1 (patch-ae) = c6720fa1ddd3b733827847e7f57b6c807641c5a7
-SHA1 (patch-af) = 5c2429d08f2f4c6f5af19dd4775277434abc7ac4
+SHA1 (patch-af) = cb76c429c01e05ceeee7664a09344dc9d27f972d
SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f
SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441
SHA1 (patch-ai) = d45bb9e224b18999489314aa1c1c74fc62a77328
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index 7b137c63c33..bbf16210a70 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,15 +1,29 @@
-$NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
+$NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
---- defs.in.orig 2004-04-27 20:16:15.000000000 +0000
+--- defs.in.orig 2005-09-27 18:38:24.000000000 +0000
+++ defs.in
-@@ -44,6 +44,7 @@ SHELL = @SCRIPT_SH@
+@@ -44,13 +44,14 @@ SHELL = @SCRIPT_SH@
# to insufficient; you are better off rerunning the
# configure script so that all uses are set correctly.
#
-+PREFIX = @PREFIX@
- SPOOL = @SPOOL@
- SBIN = @SBIN@
- BIN = @BIN@
+-SPOOL = @SPOOL@
+-SBIN = @SBIN@
+-BIN = @BIN@
+-LIBDATA = @LIBDATA@
+-LIBDIR = @LIBDIR@
+-LIBEXEC = @LIBEXEC@
+-HTMLDIR = @HTMLDIR@
++PREFIX = ${DESTDIR}@PREFIX@
++SPOOL = ${DESTDIR}@SPOOL@
++SBIN = ${DESTDIR}@SBIN@
++BIN = ${DESTDIR}@BIN@
++LIBDATA = ${DESTDIR}@LIBDATA@
++LIBDIR = ${DESTDIR}@LIBDIR@
++LIBEXEC = ${DESTDIR}@LIBEXEC@
++HTMLDIR = ${DESTDIR}@HTMLDIR@
+ FONTMAP = @FONTMAP@
+ FONTPATH = @FONTPATH@
+ SENDMAIL = @SENDMAIL@
@@ -261,7 +262,7 @@ LDFLAGS = ${LDOPTS} ${LDLIBS}
LDOPTS = ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
LDLIBS = ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
@@ -19,3 +33,12 @@ $NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $
GLDLIBS = ${SHDLIBC}
#
+@@ -322,7 +323,7 @@ INCLDIR = /usr/include
+ # MANSYS subdirectory for server & server-related apps
+ # MANFILES subdirectory for file format info
+ #
+-MAN = @MANDIR@
++MAN = ${DESTDIR}@MANDIR@
+ MANAPPS = @MANAPPS@
+ MANSYS = @MANSYS@
+ MANFILES = @MANFILES@
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 6fc3ef64587..7b2c5a452e0 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:05 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/29 16:38:20 joerg Exp $
#
DISTNAME= qpage-3.3
@@ -10,8 +10,16 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.qpage.org/
COMMENT= Simple and efficient paging (SNPP) client and server
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
CONFIGURE_ENV+= MKDIR_PATH=${MKDIR:Q}
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/qpage ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/qpage.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qpage.1
+
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 2eaac59e37d..7c4b63d80b1 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/12/01 23:48:41 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/01/29 16:39:49 joerg Exp $
DISTNAME= tkhylafax-3.1
PKGREVISION= 4
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.elgro.demon.co.uk/resources.html
COMMENT= Tcl/tk interface to Sam Leffler's fax package
+PKG_DESTDIR_SUPPORT= user-destdir
+
DEPENDS+= gv>=3.5.8nb1:../../print/gv
DEPENDS+= hylafax>=4.1:../../comms/hylafax
DEPENDS+= tk>=8.3.2:../../x11/tk
@@ -19,4 +21,6 @@ WRKSRC= ${WRKDIR}/tkhylafax
NO_CONFIGURE= yes
NO_BUILD= yes
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/tkhylafax/distinfo b/comms/tkhylafax/distinfo
index 3fc05633fc7..cfd83be863d 100644
--- a/comms/tkhylafax/distinfo
+++ b/comms/tkhylafax/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:05:31 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/01/29 16:39:49 joerg Exp $
SHA1 (tkhylafax-3.1.tar.gz) = d26dae62369c1421fbfd27785c0af0a1a4f174d1
RMD160 (tkhylafax-3.1.tar.gz) = d89207bfa630ae09866be8a73039f05c62251c3f
Size (tkhylafax-3.1.tar.gz) = 26696 bytes
-SHA1 (patch-aa) = 52ec8fc2fcd0b065c1623878962bfe8404335ceb
+SHA1 (patch-aa) = 22d9f34518f0087077e0f43335b0d6866c4e0a6b
SHA1 (patch-ab) = 5e0603062d97086fd0df469eb838c8f6342839c6
diff --git a/comms/tkhylafax/patches/patch-aa b/comms/tkhylafax/patches/patch-aa
index b688416372f..64497bb2019 100644
--- a/comms/tkhylafax/patches/patch-aa
+++ b/comms/tkhylafax/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/08/31 23:21:44 jwise Exp $
+$NetBSD: patch-aa,v 1.4 2010/01/29 16:39:49 joerg Exp $
--- Makefile.orig Sun Jan 4 23:47:29 1998
+++ Makefile Tue Dec 29 18:38:29 1998
@@ -5,19 +5,19 @@
@@ -6,15 +6,15 @@ $NetBSD: patch-aa,v 1.3 2000/08/31 23:21:44 jwise Exp $
### EDIT THE NEXT FIVE LINES ONLY ###
# The directory where the tkhylafax library will be installed
-TCLLIB_DEST = /usr/local/lib/tkhylafax-3.1
-+TCLLIB_DEST = ${PREFIX}/share/tkhylafax-3.1
++TCLLIB_DEST = ${DESTDIR}${PREFIX}/share/tkhylafax-3.1
# The directory where the tkhylafax command will be installed
-TCLPRG_DEST = /usr/local/bin
-+TCLPRG_DEST = ${PREFIX}/bin
++TCLPRG_DEST = ${DESTDIR}${PREFIX}/bin
# The directory where the man page will be installed
-TCLMAN_DEST = /usr/local/man/man1
-+TCLMAN_DEST = ${PREFIX}/man/man1
++TCLMAN_DEST = ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
# The full path to tclsh
-TCLSH = /usr/local/bin/tclsh
diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile
index 6778e2a6aba..c713cc38c6e 100644
--- a/converters/cn2jp/Makefile
+++ b/converters/cn2jp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:12 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/29 16:43:34 joerg Exp $
DISTNAME= cn2jp1.4b
PKGNAME= cn2jp-1.4b
@@ -11,6 +11,7 @@ MAINTAINER= rxg@NetBSD.org
# HOMEPAGE= http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
COMMENT= Library for code translation between Chinese and Japanese
+PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
WRKSRC= ${WRKDIR}/cn2jp
@@ -18,12 +19,12 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake
NO_CONFIGURE= yes
-AUTO_MKDIRS= yes
+
+INSTALLATION_DIRS+= bin include lib share/doc/cn2jp
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cn2jp
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cn2jp
- ${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${PREFIX}/include
- ${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${PREFIX}/include
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cn2jp
+ ${INSTALL_DATA} ${WRKSRC}/lib/jp-util.h ${DESTDIR}${PREFIX}/include
+ ${INSTALL_DATA} ${WRKSRC}/lib/lang-util.h ${DESTDIR}${PREFIX}/include
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/cn2jp/distinfo b/converters/cn2jp/distinfo
index ef93fe32d93..31830ff90c0 100644
--- a/converters/cn2jp/distinfo
+++ b/converters/cn2jp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/06/21 15:00:51 minskim Exp $
+$NetBSD: distinfo,v 1.5 2010/01/29 16:43:34 joerg Exp $
SHA1 (cn2jp1.4b.tar.gz) = 09cee0b189e5925a5378f1f817cc9593be899518
RMD160 (cn2jp1.4b.tar.gz) = 7697648e23586a0fba0d840ba57cf816c175ac10
Size (cn2jp1.4b.tar.gz) = 271660 bytes
-SHA1 (patch-aa) = a1b67afbc36161b2731a938d81e19af2c9fba7dd
+SHA1 (patch-aa) = cf112ba4083a1a7e3520c683435da78629340961
SHA1 (patch-ab) = a5a43c0dd84515a5c8b7d0cacc9a49b9b378a8e1
SHA1 (patch-ac) = b601a2893b8a94374e4b4271be49f87ee244ae53
SHA1 (patch-ad) = 4c568df93470c404f12e4221fbb64c532ff18c6b
diff --git a/converters/cn2jp/patches/patch-aa b/converters/cn2jp/patches/patch-aa
index 2381db352ba..14f7cf8ddb2 100644
--- a/converters/cn2jp/patches/patch-aa
+++ b/converters/cn2jp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 16:43:34 joerg Exp $
--- Makefile.orig Tue Feb 27 22:35:44 1996
+++ Makefile
@@ -26,9 +26,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/30 06:03:39 uebayasi Exp $
+LIB = libcn2jp.a
+
+install:
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) $(PREFIX)/lib
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIB:.a=.la) ${DESTDIR}$(PREFIX)/lib
+ for i in $(PROG);do \
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i $(PREFIX)/bin; \
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i ${DESTDIR}$(PREFIX)/bin; \
+ done
+
+all: clean mktable $(LIB) makeall
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index ddb3bea61d0..9e88feeefa3 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.13 2010/01/29 16:47:53 joerg Exp $
DISTNAME= ish-1.11
CATEGORIES= converters
@@ -7,6 +7,9 @@ MASTER_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Binary-to-text file-encoder
+PKG_DESTDIR_SUPPORT= user-destdir
+
+INSTALLATION_DIRS= bin
MAKE_FILE= makefile
BUILD_TARGET= ish
diff --git a/converters/ish/distinfo b/converters/ish/distinfo
index 65c69197cac..0398d583f68 100644
--- a/converters/ish/distinfo
+++ b/converters/ish/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/12/19 00:06:47 joerg Exp $
+$NetBSD: distinfo,v 1.7 2010/01/29 16:47:53 joerg Exp $
SHA1 (ish-1.11.tar.gz) = 99c182c685210179428d44cf1a80d96766cf3d3e
RMD160 (ish-1.11.tar.gz) = b3fd67f9ff579a865c269f0ba6db77060030fc97
Size (ish-1.11.tar.gz) = 13029 bytes
-SHA1 (patch-aa) = 51dc6991eaa9b46c71a5c9f9b4e7cb862423d50d
+SHA1 (patch-aa) = 10eccddc3167bdd3f3e1080f3a648065e0394242
SHA1 (patch-ab) = 64aec8b548fccd4ba5295cbd683cbff0304ae329
SHA1 (patch-ac) = acdbba64306ba01f37cd1d8c601e146e520a1cdf
diff --git a/converters/ish/patches/patch-aa b/converters/ish/patches/patch-aa
index 599a9899691..a39cc513f60 100644
--- a/converters/ish/patches/patch-aa
+++ b/converters/ish/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2001/08/20 02:50:56 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 16:47:53 joerg Exp $
--- makefile.orig Sun Aug 5 07:04:08 1990
+++ makefile
@@ -1,7 +1,7 @@
-DEST = .
-+DEST = ${PREFIX}/bin
++DEST = ${DESTDIR}${PREFIX}/bin
#CFLAGS = -O -DSysV
-CFLAGS = -O
-LDFLAGS = -s
diff --git a/converters/odt2txt/Makefile b/converters/odt2txt/Makefile
index 1a1dc4cb0ed..1164e53edf6 100644
--- a/converters/odt2txt/Makefile
+++ b/converters/odt2txt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/29 16:47:52 joerg Exp $
#
DISTNAME= odt2txt-0.3
@@ -9,12 +9,14 @@ MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://stosberg.net/odt2txt/
COMMENT= Simple converter from OpenDocument Text to plain text
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_TOOLS+= gmake
-MAKE_ENV+= DESTDIR="${LOCALBASE}" MANDIR="/${PKGMANDIR}"
+
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-# TODO: maybe -m 644 for install of man page
# TODO: iconv or not?
# TODO: maybe package odf2html, odfread, odfreader
diff --git a/converters/odt2txt/distinfo b/converters/odt2txt/distinfo
index 41507fbeee9..e2a93b6c283 100644
--- a/converters/odt2txt/distinfo
+++ b/converters/odt2txt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $
+$NetBSD: distinfo,v 1.2 2010/01/29 16:47:52 joerg Exp $
SHA1 (odt2txt-0.3.tar.gz) = efebf01e77a2bfa44ce7f4f24fc244889c480d77
RMD160 (odt2txt-0.3.tar.gz) = 0648959ab64018c0376045e8ae6d284d804cff9c
Size (odt2txt-0.3.tar.gz) = 28810 bytes
-SHA1 (patch-aa) = fb517f02b831c27bdab1a0bfad4bb1013299f32c
+SHA1 (patch-aa) = 26bae43601f8e06936ac39d7fb1c599a2c094ca8
diff --git a/converters/odt2txt/patches/patch-aa b/converters/odt2txt/patches/patch-aa
index 125ce16692c..5da42768eb5 100644
--- a/converters/odt2txt/patches/patch-aa
+++ b/converters/odt2txt/patches/patch-aa
@@ -1,19 +1,29 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/17 12:33:56 reed Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 16:47:52 joerg Exp $
---- Makefile.orig 2007-05-21 15:50:37.000000000 -0500
-+++ Makefile 2008-04-14 15:30:47.000000000 -0500
-@@ -19,10 +19,14 @@
+--- Makefile.orig 2007-05-21 20:50:37.000000000 +0000
++++ Makefile
+@@ -19,10 +19,8 @@ ALL_OBJ = $(OBJ) $(TEST_OBJ)
INSTALL = install
GROFF = groff
-+ifndef DESTDIR
- DESTDIR = /usr/local
-+endif
- PREFIX =
+-DESTDIR = /usr/local
+-PREFIX =
BINDIR = $(PREFIX)/bin
-+ifndef MANDIR
- MANDIR = $(PREFIX)/share/man
-+endif
+-MANDIR = $(PREFIX)/share/man
++MANDIR = $(PREFIX)/${PKGMANDIR}/man
MAN1DIR = $(MANDIR)/man1
ifeq ($(UNAME_S),FreeBSD)
+@@ -79,10 +77,8 @@ $(ALL_OBJ): Makefile
+ all: $(BIN)
+
+ install: $(BIN) $(MAN)
+- $(INSTALL) -d -m755 $(DESTDIR)$(BINDIR)
+- $(INSTALL) $(BIN) $(DESTDIR)$(BINDIR)
+- $(INSTALL) -d -m755 $(DESTDIR)$(MAN1DIR)
+- $(INSTALL) $(MAN) $(DESTDIR)$(MAN1DIR)
++ $(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
++ $(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MAN1DIR)
+
+ odt2txt.html: $(MAN)
+ $(GROFF) -Thtml -man $(MAN) > $@