summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorjlam <jlam>2008-03-01 05:17:32 +0000
committerjlam <jlam>2008-03-01 05:17:32 +0000
commit18590e4f9270889be4cdf5dfed3f45ae678e7303 (patch)
tree02b29510bcc21dd1683cc8a4bf4d7422b712a3c0 /comms
parent4d5b621f1e1604c3d7f2109a6147fcc1a101a311 (diff)
downloadpkgsrc-18590e4f9270889be4cdf5dfed3f45ae678e7303.tar.gz
+ Be like every other package and just install the man page but not
bother with the catman page. This simplifies the Makefile and the PLIST considerably. + Use the pkginstall framework to install the kermit binary as setuid-uucp. Generalize to use ${UUCP_USER} instead of "uucp". Bump PKGREVISION to 3.
Diffstat (limited to 'comms')
-rw-r--r--comms/kermit/Makefile35
-rw-r--r--comms/kermit/PLIST5
-rw-r--r--comms/kermit/options.mk19
3 files changed, 21 insertions, 38 deletions
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 7f796c90db3..05bbadb61b4 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2008/03/01 05:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2008/03/01 05:17:32 jlam Exp $
DISTNAME= cku211
PKGNAME= kermit-8.0.211
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= ftp://kermit.columbia.edu/kermit/archives/
@@ -20,7 +20,6 @@ BUILD_DEFS+= KFLAGS LIBS MANINSTALL
MAKE_ENV+= KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
MAKE_ENV+= SSLINC=${SSLINC:Q} SSLLIB=${SSLLIB:Q}
MAKE_FILE= makefile
-USE_TOOLS+= nroff
#KFLAGS+= -DNODEBUG -DNOOLDMODEMS
@@ -28,39 +27,15 @@ USE_TOOLS+= nroff
SSLINC= -I${WRKDIR}/.buildlink/include
SSLLIB= -L${WRKDIR}/.buildlink/lib ${COMPILER_RPATH_FLAG}${WRKDIR}/.buildlink/lib
-.if !empty(MANINSTALL:Mcatinstall)
-PLIST_SUBST+= HAVE_CATPAGE=""
-.else
-PLIST_SUBST+= HAVE_CATPAGE="@comment "
-.endif
-
-.if !empty(MANINSTALL:Mmaninstall)
-PLIST_SUBST+= HAVE_MANPAGE=""
-.else
-PLIST_SUBST+= HAVE_MANPAGE="@comment "
-.endif
-
.include "options.mk"
-INSTALLATION_DIRS= bin share/doc/kermit
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/kermit
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wermit ${DESTDIR}${PREFIX}/bin/kermit
${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/kermit
- set -e; \
- for OPT in ${MANINSTALL} broken-solaris-needs-this; do \
- case $$OPT in \
- catinstall) \
- nroff -man ${WRKSRC}/ckuker.nr > ${WRKSRC}/kermit.0; \
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1; \
- ${INSTALL_MAN} ${WRKSRC}/kermit.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/kermit.0; \
- ;; \
- maninstall) \
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
- ${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1; \
- ;; \
- esac; \
- done
+ ${INSTALL_MAN} ${WRKSRC}/ckuker.nr \
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1; \
.for p in NetBSD-1.3*
. if ${MACHINE_PLATFORM:M${p}} != ""
diff --git a/comms/kermit/PLIST b/comms/kermit/PLIST
index 6bde2ebd9ef..bdfa98ec7f8 100644
--- a/comms/kermit/PLIST
+++ b/comms/kermit/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2005/12/02 17:01:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/03/01 05:17:32 jlam Exp $
bin/kermit
-${HAVE_CATPAGE}man/cat1/kermit.0
-${HAVE_MANPAGE}man/man1/kermit.1
+man/man1/kermit.1
share/doc/kermit/ckaaaa.txt
share/doc/kermit/ckc211.txt
share/doc/kermit/ckcbwr.txt
diff --git a/comms/kermit/options.mk b/comms/kermit/options.mk
index e4f7f6e61b7..1e506b5b912 100644
--- a/comms/kermit/options.mk
+++ b/comms/kermit/options.mk
@@ -1,17 +1,26 @@
-# $NetBSD: options.mk,v 1.2 2008/03/01 05:04:58 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2008/03/01 05:17:32 jlam Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.kermit
-PKG_SUPPORTED_OPTIONS= kermit-suid-uucp
+PKG_OPTIONS_VAR= PKG_OPTIONS.kermit
+PKG_SUPPORTED_OPTIONS= kermit-suid-uucp
PKG_OPTIONS_OPTIONAL_GROUPS+= socks
PKG_OPTIONS_GROUP.socks= socks4 socks5
.include "../../mk/bsd.options.mk"
+###
+### Install the kermit binary as a setuid-uucp binary.
+###
.if !empty(PKG_OPTIONS:Mkermit-suid-uucp)
-BINOWN= uucp
-BINMODE= 4555
+PKG_GROUPS+= ${UUCP_GROUP}
+PKG_USERS+= ${UUCP_USER}:${UUCP_GROUP}
+PKG_GROUPS_VARS+= UUCP_GROUP
+PKG_USERS_VARS+= UUCP_USER
+SPECIAL_PERMS+= bin/kermit ${UUCP_USER} ${UUCP_GROUP} 4555
.endif
+###
+### SOCKS firewall support.
+###
.if !empty(PKG_OPTIONS:Msocks4)
KFLAGS+= -DSOCKS
LIBS+= -L${BUILDLINK_PREFIX.socks4}/lib -lsocks4