- Fix installation;

- Add an entry in ports/LEGAL;

- Clean up the port;

- Make pkg-descr look pretty and make some sligth adjustments to pkg-plist.

PR:		93879
Submitted by:	Daniel Thiele <dthiele (at) gmx.net> (maintainer)

5 files changed, 39 insertions, 36 deletions

diff --git a/LEGAL b/LEGAL
index 77b8460..45cda7b 100644
--- a/LEGAL
+++ b/LEGAL
@@ -550,6 +550,7 @@ susv3.tar.bz2		misc/susv3		Redistribution of the documents is
 						not permitted
 swing1_1_1*		java/jfc		Do not distribute without
 						value-added application
+systemc-2*.tgz		cad/systemc		License agreement required.
 tasks.zip		www/tasks		License prohibits redistribution
 tcetest_*		games/linux-enemyterritory-tce Redistribution limited
 texcm-ttf-20010117/*	x11-fonts/texcm-ttf	Cannot be sold or distributed
diff --git a/cad/systemc/Makefile b/cad/systemc/Makefile
index ea29e15..a05f0c0 100644
--- a/cad/systemc/Makefile
+++ b/cad/systemc/Makefile
@@ -7,20 +7,24 @@
 
 PORTNAME=	systemc
 PORTVERSION=	2.1.v1
+PORTREVISION=	1
 CATEGORIES=	cad devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dthiele@gmx.net
 COMMENT=	A modeling platform for system-level C++ models
 
-RESTRICTED=	"You have to register at http://www.systemc.org/account/register.php first"
+RESTRICTED=	You have to register at http://www.systemc.org/account/register.php first
 
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoheader:259 autoconf:259
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-GNU_CONFIGURE=	yes
 
 CONFIGURE_SCRIPT=	../configure
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--prefix=${PREFIX}/systemc ${CONFIGURE_TARGET}
+CONFIGURE_WRKSRC=	${WRKSRC}/objdir
+BUILD_WRKSRC=	${WRKSRC}/objdir
+INSTALL_WRKSRC=	${WRKSRC}/objdir
 
 .include <bsd.port.pre.mk>
 
@@ -28,20 +32,19 @@ CONFIGURE_SCRIPT=	../configure
 IGNORE=		is restricted. You have to register at http://www.systemc.org/account/register.php and download ${DISTFILES} from there first. Then put ${DISTFILES} into ${DISTDIR} and run make again
 .endif
 
-do-configure:
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CXXFLAGS+=	-O3
+.endif
+
+pre-everything::
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "You can enable additional compilation optimizations"
+	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
+.endif
+
+pre-configure:
 	@${MKDIR} ${WRKSRC}/objdir
-	@(cd ${WRKSRC}/objdir && \
-	${CONFIGURE_ENV} && \
-	${CONFIGURE_SCRIPT} --prefix=${PREFIX}/${PORTNAME})
-
-do-build:
-	@(cd ${WRKSRC}/objdir && \
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-	${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-do-install:
-	@(cd ${WRKSRC}/objdir && \
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-	${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@${REINPLACE_CMD} -e 's|\(OPT_CXXFLAGS="\).*"|\1${CXXFLAGS}"|g' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.post.mk>
diff --git a/cad/systemc/files/patch-configure.in b/cad/systemc/files/patch-configure
index e6519cb..49d164b 100644
--- a/cad/systemc/files/patch-configure.in
+++ b/cad/systemc/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.in.orig	Mon Apr 11 23:49:25 2005
-+++ configure.in	Fri Dec 16 23:06:05 2005
-@@ -111,6 +111,23 @@
+--- configure.orig	Sun Feb 26 23:35:41 2006
++++ configure	Sun Feb 26 23:34:39 2006
+@@ -3309,6 +3309,25 @@
  	AS=as
          QT_ARCH="sparc-os2"
          ;;
@@ -15,7 +15,9 @@
 +        	CFLAGS="$EXTRA_CXXFLAGS $OPT_CXXFLAGS"
 +                ;;
 +            *)
-+                AC_MSG_ERROR("sorry...compiler not supported")
++                { { echo "$as_me:$LINENO: error: \"sorry...compiler not supported\"" >&5
++echo "$as_me: error: \"sorry...compiler not supported\"" >&2;}
++   { (exit 1); exit 1; }; }
 +		;;
 +        esac
 +	AS=as
@@ -24,12 +26,11 @@
      *linux*)
          case "$CXX_COMP" in
              c++ | g++)
-@@ -187,7 +204,7 @@
- dnl
-
+@@ -3387,7 +3406,6 @@
+ 
+ 
  test "x$prefix" = xNONE && prefix=$srcdir
 -current_dir=`pwd`; cd $prefix; prefix=`pwd`; cd $current_dir
-+dnl current_dir=`pwd`; cd $prefix; prefix=`pwd`; cd $current_dir
-
- dnl
- dnl Substitution variables.
+ 
+ 
+ 
diff --git a/cad/systemc/pkg-descr b/cad/systemc/pkg-descr
index 5592711..08b5b85 100644
--- a/cad/systemc/pkg-descr
+++ b/cad/systemc/pkg-descr
@@ -1,11 +1,9 @@
 SystemC provides hardware-oriented constructs within the context of C++ 
-as a
-class library implemented in standard C++.  Its use spans design and
+as a class library implemented in standard C++.  Its use spans design and
 verification from concept to implementation in hardware and software.
 
 SystemC provides an interoperable modeling platform which enables the
 development and exchange of very fast system-level C++ models. It also 
-provides
-a  stable platform for development of system-level tools.
+provides a  stable platform for development of system-level tools.
 
 WWW:	http://www.systemc.org/
diff --git a/cad/systemc/pkg-plist b/cad/systemc/pkg-plist
index 3cc18c6..57efdfc 100644
--- a/cad/systemc/pkg-plist
+++ b/cad/systemc/pkg-plist
@@ -280,10 +280,10 @@ systemc/include/systemc
 systemc/include/systemc.h
 systemc/lib-freebsd/libsystemc.a
 @dirrmtry systemc/docs
-@dirrm systemc/examples/sysc/2.1
-@dirrm systemc/examples/sysc/fft
-@dirrm systemc/examples/sysc
-@dirrm systemc/examples/systemc
+@dirrmtry systemc/examples/sysc/2.1
+@dirrmtry systemc/examples/sysc/fft
+@dirrmtry systemc/examples/sysc
+@dirrmtry systemc/examples/systemc
 @dirrmtry systemc/examples
 @dirrm systemc/include/sysc/communication
 @dirrm systemc/include/sysc/datatypes/bit