- Convert to USES=tcl

- STAGE-clean

3 files changed, 47 insertions, 26 deletions

diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index 113fe9078a4c..fd1e77568d2f 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -17,18 +17,18 @@ RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
 USE_RC_SUBR=	tclhttpd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl="${TCL_LIBDIR}"	\
-		--with-tclinclude="${TCL_INCLUDEDIR}"
+		--with-tclinclude="${TCL_INCLUDEDIR}" \
+		--exec-prefix=${PREFIX}
 
-USE_TCL=	84+
-MAN1=		tclhttpd.1
+USES=		tcl
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 SHLIB_NAME!=	${MAKE} -f "${FILESDIR}/Makefile.lib" -V SHLIB_NAME
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		SHLIB_NAME=${SHLIB_NAME}
-MAKE_ENV+=	TCLSH_PROG=${TCLSH} FILESDIR="${FILESDIR}" TCL_DVER=${TCL_VER}
+MAKE_ENV+=	TCLSH_PROG=${TCLSH} FILESDIR="${FILESDIR}" TCL_DVER=${TCL_VER} \
+		PREFIX=${STAGEDIR}${PREFIX}
 SCRIPTS_ENV+=	TCL_DVER=${TCL_VER}
 SUB_LIST+=	TCL_DVER=${TCL_VER}
 
@@ -38,20 +38,17 @@ do-build:
 		${_MAKE_JOBS} -f "${FILESDIR}/Makefile.lib"
 
 pre-su-install:
-	${MKDIR} ${PREFIX}/tclhttpd/custom
+	${MKDIR} ${STAGEDIR}${PREFIX}/tclhttpd/custom
 
 post-install:
-	${CHOWN} -R nobody ${DATADIR}${PORTVERSION}
 	${INSTALL_DATA} ${WRKSRC}/${SHLIB_NAME} \
-		${PREFIX}/lib/${PORTNAME}${PORTVERSION}/${SHLIB_NAME}
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}/${SHLIB_NAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/httpd.tcl \
-		${WRKSRC}/bin/httpdthread.tcl ${PREFIX}/bin/
+		${WRKSRC}/bin/httpdthread.tcl ${STAGEDIR}${PREFIX}/bin/
 	${SED} 's%@VER@%${PORTVERSION}%g' < ${WRKSRC}/bin/tclhttpd.rc \
-		> ${PREFIX}/etc/tclhttpd.rc.default
-	cd ${PREFIX}/etc; test -e tclhttpd.rc || \
-		${CP} -p tclhttpd.rc.default tclhttpd.rc
+		> ${STAGEDIR}${PREFIX}/etc/tclhttpd.rc.default
 	${SED} 's%@LIB@%${SHLIB_NAME}%g' < \
 		${FILESDIR}/pkgIndex.tcl >> \
-		${PREFIX}/lib/${PORTNAME}${PORTVERSION}/pkgIndex.tcl
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}/pkgIndex.tcl
 
 .include <bsd.port.post.mk>
diff --git a/www/tclhttpd/files/patch-ab b/www/tclhttpd/files/patch-ab
index b4401826e2bc..7a9aa3785731 100644
--- a/www/tclhttpd/files/patch-ab
+++ b/www/tclhttpd/files/patch-ab
@@ -1,29 +1,50 @@
---- Makefile.in	Mon Aug 11 12:46:57 2003
-+++ Makefile.in	Fri Dec 17 21:08:34 2004
-@@ -124,3 +124,3 @@
+--- Makefile.in.orig	2003-08-11 18:46:57.000000000 +0200
++++ Makefile.in	2014-02-21 16:44:55.000000000 +0100
+@@ -122,7 +122,7 @@
+ limitlibdir = $(libdir)/@LIMIT_PACKAGE@@LIMIT_VERSION@
+ pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
  SERVER_ROOT = @SERVER_ROOT@
 -htdocsdir = $(SERVER_ROOT)/htdocs
 +htdocsdir = $(prefix)/share/@PACKAGE@@VERSION@
+ customdir = $(SERVER_ROOT)/custom
  
-@@ -198,3 +198,3 @@
+ top_builddir = .
+@@ -197,7 +197,7 @@
+ 
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIGDIR = @CONFIGDIR@
 -mkinstalldirs = $(SHELL) $(CONFIGDIR)/mkinstalldirs
 +mkinstalldirs = mkdir -p
  CONFIG_CLEAN_FILES =
-@@ -220,3 +220,3 @@
+ 
+ CPPFLAGS = @CPPFLAGS@
+@@ -220,7 +220,7 @@
+ # for the BINARIES that you specified above have already been done.
+ #========================================================================
  
 -all: binaries libraries doc
 +all: libraries doc
-
-@@ -236,3 +236,3 @@
+ 
+ #========================================================================
+ # The binaries target builds executable programs, Windows .dll's, unix
+@@ -236,7 +236,7 @@
+ 
+ doc:
  
 -install: all install-binaries install-libraries install-doc
 +install: all install-libraries install-doc
  
-@@ -330,1 +330,1 @@
--	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/httpd.1
-+	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/tclhttpd.1
-@@ -335,7 +335,4 @@
+ install-binaries: binaries install-lib-binaries
+ 
+@@ -328,21 +328,18 @@
+ 	$(INSTALL_DATA) $(srcdir)/INSTALL $(DESTDIR)$(htdocsdir)/links/INSTALL.txt
+ 	@echo "Copying license.terms into $(DESTDIR)$(htdocsdir)"
+ 	$(INSTALL_DATA) $(srcdir)/license.terms $(DESTDIR)$(htdocsdir)/license.terms
+-
++	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/tclhttpd.1
+ install-custom:
+ 	@echo "Adding custom code in $(DESTDIR)$(customdir)"
+ 	$(TCLSH_PROG) `@CYGPATH@ $(srcdir)/bin/CopyDist` `@CYGPATH@ $(srcdir)/custom` `@CYGPATH@ $(DESTDIR)$(customdir)`
  
  install-doc: install-htdocs
 -	@echo "Installing man page"
@@ -31,10 +52,11 @@
 -	$(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(DESTDIR)$(mandir)/man1/httpd.1
  	@echo "Installing README"
  	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(SERVER_ROOT)
-@@ -343,5 +343,5 @@
+ 	$(INSTALL_DATA) $(srcdir)/bin/README_custom $(DESTDIR)$(SERVER_ROOT)
  
  installdirs:
 -	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(cryptlibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir)
 +	$(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir)
  
  clean:  
+ 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
diff --git a/www/tclhttpd/pkg-plist b/www/tclhttpd/pkg-plist
index a02a51d2f544..1a7feda73b4e 100644
--- a/www/tclhttpd/pkg-plist
+++ b/www/tclhttpd/pkg-plist
@@ -1,7 +1,8 @@
 bin/httpd.tcl
 bin/httpdthread.tcl
-etc/tclhttpd.rc
 etc/tclhttpd.rc.default
+man/man1/tclhttpd.1.gz
+@owner nobody
 lib/tclhttpd%%PORTVERSION%%/%%SHLIB_NAME%%
 lib/tclhttpd%%PORTVERSION%%/admin.tcl
 lib/tclhttpd%%PORTVERSION%%/auth.tcl
@@ -48,6 +49,7 @@ lib/tclhttpd%%PORTVERSION%%/utils.tcl
 lib/tclhttpd%%PORTVERSION%%/version.tcl
 lib/tclhttpd%%PORTVERSION%%/mime.types
 @dirrm lib/tclhttpd%%PORTVERSION%%
+@owner root
 share/tclhttpd%%PORTVERSION%%/.tml
 share/tclhttpd%%PORTVERSION%%/access/.htaccess
 share/tclhttpd%%PORTVERSION%%/access/README.txt