diff -urN /usr/ports/textproc/source-highlight/Makefile textproc/source-highlight/Makefile
--- /usr/ports/textproc/source-highlight/Makefile	Sat Apr 12 23:29:38 2003
+++ textproc/source-highlight/Makefile	Fri Oct  3 22:48:14 2003
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	source-highlight
-PORTVERSION=	1.5
+PORTVERSION=	1.8
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= source-highlight
+MASTER_SITE_SUBDIR=	src-highlite
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	C/C++ and Java sources to HTML converter
 
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if defined(NOPORTDOCS)
 MAKE_ENV+=	NOPORTDOCS="${NOPORTDOCS}"
 .endif
diff -urN /usr/ports/textproc/source-highlight/distinfo textproc/source-highlight/distinfo
--- /usr/ports/textproc/source-highlight/distinfo	Tue Sep 10 20:29:03 2002
+++ textproc/source-highlight/distinfo	Fri Oct  3 22:08:18 2003
@@ -1 +1 @@
-MD5 (source-highlight-1.5.tar.gz) = 8b4a767f5e0518ebf71b3a708a915c13
+MD5 (source-highlight-1.8.tar.gz) = 2d8f1b6aab702f8c5ce952542cd5fb02
diff -urN /usr/ports/textproc/source-highlight/files/patch-ac textproc/source-highlight/files/patch-ac
--- /usr/ports/textproc/source-highlight/files/patch-ac	Thu Jan  1 09:00:00 1970
+++ textproc/source-highlight/files/patch-ac	Fri Oct  3 22:21:04 2003
@@ -0,0 +1,18 @@
+--- tests/Makefile.in.orig	Sun Aug 31 22:57:10 2003
++++ tests/Makefile.in	Fri Oct  3 22:20:56 2003
+@@ -218,6 +218,7 @@
+ uninstall-info-am:
+ source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
+ install-source_highlightdocDATA: $(source_highlightdoc_DATA)
++.if !defined(NOPORTDOCS)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
+ 	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
+@@ -226,6 +227,7 @@
+ 	  echo " $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f"; \
+ 	  $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f; \
+ 	done
++.endif
+ 
+ uninstall-source_highlightdocDATA:
+ 	@$(NORMAL_UNINSTALL)
diff -urN /usr/ports/textproc/source-highlight/pkg-plist textproc/source-highlight/pkg-plist
--- /usr/ports/textproc/source-highlight/pkg-plist	Tue Sep 10 20:29:03 2002
+++ textproc/source-highlight/pkg-plist	Fri Oct  3 22:18:43 2003
@@ -1,42 +1,47 @@
 bin/cpp2html
 bin/java2html
 bin/source-highlight
-%%PORTDOCS%%share/doc/source-highlight/COPYING
-%%PORTDOCS%%share/doc/source-highlight/CREDITS
-%%PORTDOCS%%share/doc/source-highlight/ChangeLog
-%%PORTDOCS%%share/doc/source-highlight/Hello.css
-%%PORTDOCS%%share/doc/source-highlight/Hello.java
-%%PORTDOCS%%share/doc/source-highlight/Hello.java.html
-%%PORTDOCS%%share/doc/source-highlight/Hello1.html
-%%PORTDOCS%%share/doc/source-highlight/Hello2.css
-%%PORTDOCS%%share/doc/source-highlight/Hello2.html
-%%PORTDOCS%%share/doc/source-highlight/Hello3.html
-%%PORTDOCS%%share/doc/source-highlight/Hello4.html
-%%PORTDOCS%%share/doc/source-highlight/Hello5.html
-%%PORTDOCS%%share/doc/source-highlight/Hello_h_f.html
-%%PORTDOCS%%share/doc/source-highlight/Hello_lines.html
-%%PORTDOCS%%share/doc/source-highlight/Hello_xhtml.html
-%%PORTDOCS%%share/doc/source-highlight/Hello_xhtml2.html
-%%PORTDOCS%%share/doc/source-highlight/INSTALL
-%%PORTDOCS%%share/doc/source-highlight/NEWS
-%%PORTDOCS%%share/doc/source-highlight/README
-%%PORTDOCS%%share/doc/source-highlight/README.compile_VC6
-%%PORTDOCS%%share/doc/source-highlight/THANKS
-%%PORTDOCS%%share/doc/source-highlight/TODO.txt
-%%PORTDOCS%%share/doc/source-highlight/cmdline.c.html
-%%PORTDOCS%%share/doc/source-highlight/cmdline.h.html
-%%PORTDOCS%%share/doc/source-highlight/colors.html
-%%PORTDOCS%%share/doc/source-highlight/cpp2html.css
-%%PORTDOCS%%share/doc/source-highlight/mono-alt.css
-%%PORTDOCS%%share/doc/source-highlight/mono.css
-%%PORTDOCS%%share/doc/source-highlight/source-highlight.html
-%%PORTDOCS%%share/doc/source-highlight/startapp.cc.html
-%%PORTDOCS%%share/doc/source-highlight/test.php3.html
-%%PORTDOCS%%share/doc/source-highlight/test.pl.html
-%%PORTDOCS%%share/doc/source-highlight/test.pm.html
-%%PORTDOCS%%share/doc/source-highlight/test.py.html
-%%PORTDOCS%%share/doc/source-highlight/xhtml.css
-share/source-highlight/tags.j2h 
-share/source-highlight/tags2.j2h 
-@dirrm share/source-highlight
-%%PORTDOCS%%@dirrm share/doc/source-highlight
+bin/source-highlight-cgi
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello.css
+%%PORTDOCS%%%%DOCSDIR%%/Hello.java
+%%PORTDOCS%%%%DOCSDIR%%/Hello.java.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello1.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello2.css
+%%PORTDOCS%%%%DOCSDIR%%/Hello2.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello3.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello4.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello5.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello_h_f.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello_lines.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello_xhtml.html
+%%PORTDOCS%%%%DOCSDIR%%/Hello_xhtml2.html
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.compile_VC6
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTDOCS%%%%DOCSDIR%%/cmdline.c.html
+%%PORTDOCS%%%%DOCSDIR%%/cmdline.h.html
+%%PORTDOCS%%%%DOCSDIR%%/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/cpp2html.css
+%%PORTDOCS%%%%DOCSDIR%%/flex_scanner.ll.html
+%%PORTDOCS%%%%DOCSDIR%%/mono-alt.css
+%%PORTDOCS%%%%DOCSDIR%%/mono.css
+%%PORTDOCS%%%%DOCSDIR%%/source-highlight.html
+%%PORTDOCS%%%%DOCSDIR%%/startapp.cc.html
+%%PORTDOCS%%%%DOCSDIR%%/test.js.html
+%%PORTDOCS%%%%DOCSDIR%%/test.php3.html
+%%PORTDOCS%%%%DOCSDIR%%/test.pl.html
+%%PORTDOCS%%%%DOCSDIR%%/test.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/test.py.html
+%%PORTDOCS%%%%DOCSDIR%%/test.rb.html
+%%PORTDOCS%%%%DOCSDIR%%/xhtml.css
+%%DATADIR%%/tags.j2h
+%%DATADIR%%/tags2.j2h
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%