summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-10-04 23:47:28 +0000
committerjlam <jlam@pkgsrc.org>2002-10-04 23:47:28 +0000
commit79f8ecf67cefa85f52f89c0ca4c3317190398884 (patch)
tree884c4293ab1de6cbd9996550bf9ddad78d88594f /comms
parent561ca1b8b7fd84b59c991487a184066040d324e8 (diff)
downloadpkgsrc-79f8ecf67cefa85f52f89c0ca4c3317190398884.tar.gz
* Use buildlink2.
* Honor PKG_SYSCONFDIR. * Note the setuid minicom binary in SPECIAL_PERMS.
Diffstat (limited to 'comms')
-rw-r--r--comms/minicom/Makefile24
-rw-r--r--comms/minicom/PLIST6
-rw-r--r--comms/minicom/distinfo4
-rw-r--r--comms/minicom/patches/patch-aa50
4 files changed, 57 insertions, 27 deletions
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index db8fc06e143..557eb6aff47 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/09/27 23:17:50 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/10/04 23:47:28 jlam Exp $
# FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
#
@@ -16,11 +16,20 @@ BUILD_USES_MSGFMT= yes
DEPENDS+= gkermit-[0-9]*:../../comms/gkermit
DEPENDS+= lrzsz-[0-9]*:../../comms/lrzsz
-USE_LIBINTL= yes
-USE_GMAKE= yes
-NO_CONFIGURE= yes
+USE_BUILDLINK2= # defined
+USE_GMAKE= # defined
+NO_CONFIGURE= # defined
-WRKSRC= ${WRKDIR}/${PKGNAME}/src
+WRKSRC= ${WRKDIR}/${PKGNAME}/src
+PKG_SYSCONFSUBDIR= minicom
+EGDIR= ${PREFIX}/share/examples/minicom
+
+PKG_GROUPS= dialer
+PKG_USERS= uucp:dialer
+SPECIAL_PERMS= ${PREFIX}/bin/minicom uucp dialer 4755
+OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} uucp dialer 0755
+CONF_FILES_PERMS= ${EGDIR}/minicom.users ${PKG_SYSCONFDIR}/minicom.users \
+ uucp dialer 0644
# for BATCH !
.include "../../mk/bsd.prefs.mk"
@@ -31,7 +40,6 @@ pre-install:
${SH} ${SCRIPTDIR}/create-dev-link
.endif
-post-install:
- @${CHOWN} -R uucp:dialer ${PREFIX}/etc/minicom
-
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/minicom/PLIST b/comms/minicom/PLIST
index b5c105391f5..c8fe8111afb 100644
--- a/comms/minicom/PLIST
+++ b/comms/minicom/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:31 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/10/04 23:47:28 jlam Exp $
bin/ascii-xfr
bin/minicom
bin/runscript
bin/xminicom
-etc/minicom/minicom.users
man/man1/minicom.1
man/man1/runscript.1
man/man1/ascii-xfr.1
@@ -46,6 +45,7 @@ share/doc/minicom/tables/mc.iso
share/doc/minicom/tables/mc.noconv
share/doc/minicom/tables/mc.pc8
share/doc/minicom/tables/mc.sf7
+share/examples/minicom/minicom.users
share/locale/fi_FI/LC_MESSAGES/minicom.mo
share/locale/fr/LC_MESSAGES/minicom.mo
share/locale/ja/LC_MESSAGES/minicom.mo
@@ -53,7 +53,7 @@ share/locale/ja_JP.SJIS/LC_MESSAGES/minicom.mo
share/locale/ko/LC_MESSAGES/minicom.mo
share/locale/pl/LC_MESSAGES/minicom.mo
share/locale/pt_BR/LC_MESSAGES/minicom.mo
+@dirrm share/examples/minicom
@dirrm share/doc/minicom/tables
@dirrm share/doc/minicom/demos
@dirrm share/doc/minicom
-@unexec ${RM} -rf %D/etc/minicom
diff --git a/comms/minicom/distinfo b/comms/minicom/distinfo
index c58f000537c..c594e11bfb5 100644
--- a/comms/minicom/distinfo
+++ b/comms/minicom/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:04:23 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/10/04 23:47:28 jlam Exp $
SHA1 (minicom-1.83.1.src.tar.gz) = 0c1c7fd8c95304c47c0c106f54b997f2d320c883
Size (minicom-1.83.1.src.tar.gz) = 323223 bytes
-SHA1 (patch-aa) = f90b80f4697b4121e31107094149ad2ded2c7109
+SHA1 (patch-aa) = aca3573b4ba3b56e8f03667e8c59131b4926d0bb
SHA1 (patch-ab) = 16aba24da471e1f04e2a86a3d198c8b75ec13a9c
SHA1 (patch-ac) = 53dd29da9c9355ba0dd003f1da13daa4775f5426
SHA1 (patch-ad) = 52ae46aa6633f6d3cfcf478e46712963b1c9286b
diff --git a/comms/minicom/patches/patch-aa b/comms/minicom/patches/patch-aa
index 8af099bcfe2..32cb16c7b67 100644
--- a/comms/minicom/patches/patch-aa
+++ b/comms/minicom/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
+$NetBSD: patch-aa,v 1.8 2002/10/04 23:47:28 jlam Exp $
---- Makefile.orig Tue Apr 25 17:42:32 2000
-+++ Makefile Mon Jun 12 20:21:05 2000
+--- Makefile.orig Tue Apr 25 08:42:32 2000
++++ Makefile
@@ -22,10 +22,10 @@
# enochw@scn.org Oct 99: flags for UWIN 2.0 (Unix for Windows)
@@ -17,20 +17,21 @@ $NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
# fmg 8/22/97: seems a more logical place for this :-)
# Select Compile Options you want:
-@@ -53,6 +53,12 @@
+@@ -53,6 +53,13 @@ PO = po
# DOCDIR = /usr/local/etc/minicom
# MANDIR = /usr/local/man/man1
+# Where to install things for NetBSD sites.
+BINDIR = ${PREFIX}/bin
-+LIBDIR = ${PREFIX}/etc/minicom
++LIBDIR = ${PKG_SYSCONFDIR}
++EGDIR = ${PREFIX}/share/examples/minicom
+DOCDIR = ${PREFIX}/share/doc/minicom
+MANDIR = ${PREFIX}/man/man1
+
# Where to install things for "normal" sites.
# BINDIR = /usr/local/bin
# LIBDIR = /usr/local/lib
-@@ -60,11 +66,11 @@
+@@ -60,11 +67,11 @@ PO = po
# MANDIR = /usr/local/man/man1
# Take these compilation flags for Linux with libncurses.
@@ -47,18 +48,39 @@ $NetBSD: patch-aa,v 1.7 2000/06/12 18:40:55 rh Exp $
# Take these compilation flags for FreeBSD.
#FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
-@@ -173,6 +179,14 @@
- #LFLAGS = -s
+@@ -174,6 +181,13 @@ CC = cc
#PROGS = minicom runscript ascii-xfr keyserv
#LIBS =
-+
+
+# Take these compilation flags for NetBSD.
-+FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -I$(PREFIX)/include -DBINDIR=\"$(BINDIR)\"
++FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
+PROGS = minicom runscript ascii-xfr
-+LFLAGS = -s
-+INTL = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -lintl
-+LIBS = $(INTL) -lcurses -ltermcap
++LFLAGS = $(LDFLAGS)
++LIBS = -lintl -lcurses -ltermcap
+CC = cc
-
++
# Nothing should have to change beneath this line
+ SRCS = minicom.c vt100.c config.c help.c updown.c \
+@@ -199,7 +213,7 @@ KOBJS = keyserv.o wkeys.o sysdep2.o
+ SOBJS = script.o sysdep1.o common.o
+
+ # fmg 8/22/97: merge in new OPFLAGS...
+-CFLAGS = $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
++CFLAGS = $(CPPFLAGS) $(FLAGS) $(OPFLAGS) -DBINDIR=\"$(BINDIR)\" -DLIBDIR=\"$(LIBDIR)\"
+
+ R = $(ROOTDIR)
+
+@@ -263,10 +277,10 @@ dummy:
+
+ install: $(PROGS)
+ $(MAKE) -C po install R=$(R)
+- sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
++ sh install.sh $(R)$(EGDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
+
+ install2: $(PROGS)
+- sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
++ sh install.sh $(R)$(EGDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
+
+ clobber:
+ rm -f *.o *~ minicom keyserv runscript ascii-xfr