Index: head/www/thttpd/Makefile
===================================================================
--- head/www/thttpd/Makefile	(revision 417641)
+++ head/www/thttpd/Makefile	(revision 417642)
@@ -1,56 +1,54 @@
 # Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
 
 PORTNAME=	thttpd
 PORTVERSION=	2.27
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.acme.com/software/thttpd/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Tiny/turbo/throttling HTTP server with CGI support
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cpe gmake	# parallel builds (-jX) are broken with BSD make(1)
+USES=		cpe
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	WEBDIR=${WWWDIR}
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message thttpd.conf.sample
 SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 CPE_VENDOR=	acme
-
-MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	SENDFILE IPREAL INDEXES HTACCESS
 OPTIONS_DEFAULT=	SENDFILE IPREAL
 
 SENDFILE_DESC=	Use sendfile(2) to serve files
 IPREAL_DESC=	Respect (pass on) "X-Forwarded-For" header
 INDEXES_DESC=	Generate index pages for directories
 HTACCESS_DESC=	IP-based authorization (.htaccess) support
 
 SENDFILE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-config.h
 IPREAL_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ip_real
 HTACCESS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-htaccess
 
 .include <bsd.port.options.mk>
 
 post-patch:
 # To avoid conflict with other ports that also install htpasswd(1)
 .for f in extras/htpasswd.1 extras/htpasswd.c thttpd.8
 	@${REINPLACE_CMD} -e '/\.htpasswd/!s|htpasswd|t&|g' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} -e 's|/var/www|${WWWDIR}|' \
 		${WRKSRC}/extras/makeweb.1
 .if ! ${PORT_OPTIONS:MINDEXES}
 	@${REINPLACE_CMD} -e '/GENERATE_INDEXES/s|.*|/* & */|' \
 		${WRKSRC}/config.h
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${PRINTF} "/var/log/thttpd.log\t  ${WWWOWN}:${WWWGRP}\t640 7 * @T00\
 		J\t/var/run/thttpd.pid\n" > \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/${PORTNAME}.conf
 
 .include <bsd.port.mk>
Index: head/www/thttpd/files/patch-cgi-src_Makefile.in
===================================================================
--- head/www/thttpd/files/patch-cgi-src_Makefile.in	(revision 417641)
+++ head/www/thttpd/files/patch-cgi-src_Makefile.in	(revision 417642)
@@ -1,40 +1,49 @@
 --- cgi-src/Makefile.in.orig	Tue Apr 24 19:44:12 2001
 +++ cgi-src/Makefile.in	Tue Apr 24 19:44:25 2001
 @@ -31,7 +31,7 @@
  MANDIR =	@mandir@
  
  CC =		@CC@
 -CCOPT =		@V_CCOPT@
 +CCOPT =		@CFLAGS@
  DEFS =		@DEFS@
  INCLS =		-I..
  CFLAGS =	$(CCOPT) $(DEFS) $(INCLS)
+@@ -46,7 +46,7 @@
+ 
+ .c.o:
+ 	@rm -f $@
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) -o $@ -c $<
+ 
+ all:		redirect ssi phf
+ 
 @@ -67,17 +67,17 @@
  	cd .. ; $(MAKE) $(MFLAGS) strerror.o
  
  install:	all
 -	-mkdir -p $(CGIBINDIR)
 -	rm -f $(CGIBINDIR)/redirect
 -	cp redirect $(CGIBINDIR)/redirect
 -	rm -f $(MANDIR)/man8/redirect.8
 -	cp redirect.8 $(MANDIR)/man8/redirect.8
 -	rm -f $(CGIBINDIR)/ssi
 -	cp ssi $(CGIBINDIR)/ssi
 -	rm -f $(MANDIR)/man8/ssi.8
 -	cp ssi.8 $(MANDIR)/man8/ssi.8
 -	rm -f $(CGIBINDIR)/phf
 -	cp phf $(CGIBINDIR)/phf
 +	-mkdir -p $(DESTDIR)$(CGIBINDIR)
 +	rm -f $(DESTDIR)$(CGIBINDIR)/redirect
 +	$(INSTALL) -s -m 555 redirect $(DESTDIR)$(CGIBINDIR)/redirect
 +	rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8
 +	$(INSTALL) -m 444 redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
 +	rm -f $(DESTDIR)$(CGIBINDIR)/ssi
 +	$(INSTALL) -s -m 555 ssi $(DESTDIR)$(CGIBINDIR)/ssi
 +	rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8
 +	$(INSTALL) -m 444 ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
 +	rm -f $(DESTDIR)$(CGIBINDIR)/phf
 +	$(INSTALL) -s -m 555 phf $(DESTDIR)$(CGIBINDIR)/phf
  
  clean:
  	rm -f $(CLEANFILES)