Index: head/mail/popper/Makefile
===================================================================
--- head/mail/popper/Makefile	(revision 8178)
+++ head/mail/popper/Makefile	(revision 8179)
@@ -1,56 +1,54 @@
 # New ports collection makefile for:	popper
 # Version required:     2.4b2
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.16 1997/10/07 20:37:15 ache Exp $
+# $Id: Makefile,v 1.17 1997/10/07 20:55:49 ache Exp $
 #
 
 DISTNAME=       qpopper2.4b2
 PKGNAME=        qpopper-2.4b2
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pst@freebsd.org
 
 #
 # If APOP_ONLY variable present in the environment, popper builds
 # with APOP authentification only
 #
-
-NO_PACKAGE=	"Needs POP UID"
 
 O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
 		-DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
 		-DPOPUID='\"pop\"' \
 		-DNONAUTHFILE='\"/etc/ftpusers\"'
 
 .if !defined(APOP_ONLY)
 .if exists(/usr/lib/libskey.a)
 P_LIBS=         -lskey
 O_DEFS+=        -DSKEY
 .endif
 .else
 O_DEFS+=        -DAPOP_ONLY
 .endif
 
 P_LIBS+=        -lmd -lcrypt -lutil
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV+= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
 MAN8=   popauth.8 popper.8
 
 post-patch:
 	$(RM) ${WRKSRC}/md5.h
 
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} popper ${PREFIX}/libexec
 	cd ${WRKSRC} && \
 		${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8
 
 .include <bsd.port.mk>

Property changes on: head/mail/popper/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/mail/popper/pkg-req
===================================================================
--- head/mail/popper/pkg-req	(nonexistent)
+++ head/mail/popper/pkg-req	(revision 8179)
@@ -0,0 +1,12 @@
+if [ "$2" != "INSTALL" ]; then
+  exit 0
+fi
+if ! id -u pop > /dev/null 2>&1; then
+  echo "You need an account \"pop\" to install this package."
+  echo "Please add it by hand (try \"man vipw\") and try again."
+  echo ""
+  echo "An example passwd entry is:"
+  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
+  echo ""
+  exit 1
+fi

Property changes on: head/mail/popper/pkg-req
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/mail/popper/scripts/pre-install
===================================================================
--- head/mail/popper/scripts/pre-install	(revision 8178)
+++ head/mail/popper/scripts/pre-install	(revision 8179)
@@ -1,16 +1,16 @@
 #!/bin/sh
 if ! id -u pop > /dev/null 2>&1; then
   echo "You need an account \"pop\" to install this package."
   echo "Please add it by hand (try \"man vipw\") and try again."
   echo ""
-  echo "An example passwd entry (assuming uid 68 is available) is;"
-  echo "pop:*:68:1::0:0:Post Office Owner:/nonexistent:/nonexistent"
+  echo "An example passwd entry is:"
+  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
   echo ""
   exit 1
 fi
 usrdir=${PREFIX}/etc/popper
 if [ ! -d $usrdir ]; then
   mkdir -p $usrdir
 fi
 chown pop.daemon $usrdir
 chmod 700 $usrdir

Property changes on: head/mail/popper/scripts/pre-install
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/mail/qpopper/Makefile
===================================================================
--- head/mail/qpopper/Makefile	(revision 8178)
+++ head/mail/qpopper/Makefile	(revision 8179)
@@ -1,56 +1,54 @@
 # New ports collection makefile for:	popper
 # Version required:     2.4b2
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.16 1997/10/07 20:37:15 ache Exp $
+# $Id: Makefile,v 1.17 1997/10/07 20:55:49 ache Exp $
 #
 
 DISTNAME=       qpopper2.4b2
 PKGNAME=        qpopper-2.4b2
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pst@freebsd.org
 
 #
 # If APOP_ONLY variable present in the environment, popper builds
 # with APOP authentification only
 #
-
-NO_PACKAGE=	"Needs POP UID"
 
 O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
 		-DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
 		-DPOPUID='\"pop\"' \
 		-DNONAUTHFILE='\"/etc/ftpusers\"'
 
 .if !defined(APOP_ONLY)
 .if exists(/usr/lib/libskey.a)
 P_LIBS=         -lskey
 O_DEFS+=        -DSKEY
 .endif
 .else
 O_DEFS+=        -DAPOP_ONLY
 .endif
 
 P_LIBS+=        -lmd -lcrypt -lutil
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV+= LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
 MAN8=   popauth.8 popper.8
 
 post-patch:
 	$(RM) ${WRKSRC}/md5.h
 
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} popper ${PREFIX}/libexec
 	cd ${WRKSRC} && \
 		${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8
 
 .include <bsd.port.mk>

Property changes on: head/mail/qpopper/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/mail/qpopper/pkg-req
===================================================================
--- head/mail/qpopper/pkg-req	(nonexistent)
+++ head/mail/qpopper/pkg-req	(revision 8179)
@@ -0,0 +1,12 @@
+if [ "$2" != "INSTALL" ]; then
+  exit 0
+fi
+if ! id -u pop > /dev/null 2>&1; then
+  echo "You need an account \"pop\" to install this package."
+  echo "Please add it by hand (try \"man vipw\") and try again."
+  echo ""
+  echo "An example passwd entry is:"
+  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
+  echo ""
+  exit 1
+fi

Property changes on: head/mail/qpopper/pkg-req
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/mail/qpopper/scripts/pre-install
===================================================================
--- head/mail/qpopper/scripts/pre-install	(revision 8178)
+++ head/mail/qpopper/scripts/pre-install	(revision 8179)
@@ -1,16 +1,16 @@
 #!/bin/sh
 if ! id -u pop > /dev/null 2>&1; then
   echo "You need an account \"pop\" to install this package."
   echo "Please add it by hand (try \"man vipw\") and try again."
   echo ""
-  echo "An example passwd entry (assuming uid 68 is available) is;"
-  echo "pop:*:68:1::0:0:Post Office Owner:/nonexistent:/nonexistent"
+  echo "An example passwd entry is:"
+  echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
   echo ""
   exit 1
 fi
 usrdir=${PREFIX}/etc/popper
 if [ ! -d $usrdir ]; then
   mkdir -p $usrdir
 fi
 chown pop.daemon $usrdir
 chmod 700 $usrdir

Property changes on: head/mail/qpopper/scripts/pre-install
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property