Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.545
retrieving revision 1.555
diff -r1.545 -r1.555
49d48
< # PORTOBJFORMAT	- The object format ("aout" or "elf").
309,312c313
< #				- If set, this port uses getopt_long. If OSVERSION
< #				  less than 500041, automatically adds devel/libgnugeopt
< #				  to LIB_DEPENDS, and pass adjusted values of
< #				  CPPFLAGS and LDFLAGS in CONFIGURE_ENV.
---
1153,1157d1170
< # Get the object format.
< .if !defined(PORTOBJFORMAT)
< PORTOBJFORMAT!=		${TEST} -x /usr/bin/objformat && /usr/bin/objformat || ${ECHO_CMD} aout
< .endif
< 
1618c1577
< PLIST_REINPLACE+=	dirrmtry
---
> PLIST_REINPLACE+=	dirrmtry stopdaemon
1638,1641c1605,1606
< CONFIGURE_ENV+=	SHELL=${SH} CONFIG_SHELL=${SH} PORTOBJFORMAT=${PORTOBJFORMAT}
< SCRIPTS_ENV+=	PORTOBJFORMAT=${PORTOBJFORMAT}
< MAKE_ENV+=		SHELL=${SH} PORTOBJFORMAT=${PORTOBJFORMAT} NO_LINT=YES
< PLIST_SUB+=		PORTOBJFORMAT=${PORTOBJFORMAT}
---
> CONFIGURE_ENV+=	SHELL=${SH} CONFIG_SHELL=${SH}
> MAKE_ENV+=		SHELL=${SH} NO_LINT=YES
1738,1746d1702
< .if defined(USE_GETOPT_LONG)
< .if ${OSVERSION} < 500041
< LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
< CPPFLAGS+=		-I${LOCALBASE}/include
< LDFLAGS+=		-L${LOCALBASE}/lib -lgnugetopt
< CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
< .endif
< .endif
< 
1748,1751d1703
< .if ${OSVERSION} < 500037
< RUN_DEPENDS+=	${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr
< RC_SUBR=	${LOCALBASE}/etc/rc.subr
< .else
1753d1704
< .endif
2130,2136d2063
< .if ${OSVERSION} < 500016
< PTHREAD_CFLAGS?=	-D_THREAD_SAFE
< PTHREAD_LIBS?=		-pthread
< .elif ${OSVERSION} < 502102
< PTHREAD_CFLAGS?=	-D_THREAD_SAFE
< PTHREAD_LIBS?=		-lc_r
< .else
2139d2065
< .endif
2294,2296c2211,2213
< .if (${OSVERSION} < 491101 && ${PKGORIGIN} != "sysutils/pkg_install") || exists(${LOCALBASE}/sbin/pkg_info)
< .if ${OSVERSION} < 491101 && ${PKGORIGIN} != "sysutils/pkg_install"
< EXTRACT_DEPENDS+=	${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install
---
> .if ((${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install") || exists(${LOCALBASE}/sbin/pkg_info)
> .if (${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install"
> EXTRACT_DEPENDS+=	${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/ports-mgmt/pkg_install