- Update MASTER_SITES and WWW: line

- Add LICENSE
- Support PLIST_FILES

4 files changed, 30 insertions, 49 deletions

diff --git a/www/comclear/Makefile b/www/comclear/Makefile
index a62cc45a9f3f..6bee0dc76e8b 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -1,37 +1,39 @@
-# New ports collection makefile for:	comclear
-# Date created:		26 November 2000
-# Whom:			roam@FreeBSD.org
-#
+# Created by: roam@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	comclear
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://www.neuro-tech.net/files/
+MASTER_SITES=	http://lukereeves.com/files/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A history cleaner for Netscape Navigator and Communicator
+COMMENT=	History cleaner for Netscape Navigator and Communicator
+
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	GTK1 DOCS
 
-WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake14 autoconf213
+CONFIGURE_ARGS=	--disable-gtktest
+
+PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README
+PLIST_FILES=	bin/comclear
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${HAVE_GNOME:Mgtk12}!=""
+.if ${PORT_OPTIONS:MGTK1}
 USE_GNOME+=	gtk12
-PKGNAMESUFFIX=	-gtk
+.else
+CONFIGURE_ENV+=	ac_cv_path_GTK_CONFIG=no
 .endif
 
-# Do not install docs by default, see the ifdef'd post-install below.
-post-configure:
-		${REINPLACE_CMD} 's/^install-data-am:.*/install-data-am:/' ${WRKSRC}/Makefile
-
-.if		!defined(NOPORTDOCS)
-post-install:
-		cd ${WRKSRC} && ${GMAKE} install-docDATA
-.endif
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} comclear ${PREFIX}/bin)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/comclear/files/patch-aa b/www/comclear/files/patch-aa
deleted file mode 100644
index e3e7bd811410..000000000000
--- a/www/comclear/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am	2000/11/14 08:59:14	1.1.1.1
-+++ Makefile.am	2000/11/14 09:48:03	1.2
-@@ -5,7 +5,7 @@
- bin_PROGRAMS = comclear
- comclear_SOURCES = comclear.c gui.c gui.h
- 
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = README NEWS ChangeLog AUTHORS COPYING INSTALL
- 
- dist-hook: comclear.spec
diff --git a/www/comclear/pkg-descr b/www/comclear/pkg-descr
index b85277810ec8..3cf179356f60 100644
--- a/www/comclear/pkg-descr
+++ b/www/comclear/pkg-descr
@@ -1,11 +1,9 @@
-From the ComClear README:
+ComClear is a history cleaner for Netscape Navigator and Communicator.
+It allows a user to choose from deleting the cache, cookies, history
+and drop-down list.
 
-"ComClear is a history cleaner for Netscape Navigator and Communicator.  It 
- allows a user to choose from deleting the cache, cookies, history and 
- drop-down list.
+Comclear has both a command-line version and a GTK+ version, the latter
+of which is run automatically when comclear is run from an X session.
 
- Comclear has both a command-line version and a GTK+ version, the latter of 
- which is run automatically when comclear is run from an X session."
-
-Author:		Luke Reeves <luke@submail.net>
-WWW:		http://www.neuro-tech.net/comclearu.html
+Author: Luke Reeves <luke@neuro-tech.net>
+WWW: http://lukereeves.com/
diff --git a/www/comclear/pkg-plist b/www/comclear/pkg-plist
deleted file mode 100644
index d66e3076c55e..000000000000
--- a/www/comclear/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/comclear
-%%PORTDOCS%%share/doc/comclear/README
-%%PORTDOCS%%share/doc/comclear/NEWS
-%%PORTDOCS%%share/doc/comclear/ChangeLog
-%%PORTDOCS%%share/doc/comclear/AUTHORS
-%%PORTDOCS%%share/doc/comclear/COPYING
-%%PORTDOCS%%share/doc/comclear/INSTALL
-%%PORTDOCS%%@dirrm share/doc/comclear