From 5fa2823e979f4e423987f4434747c43150e6b4fd Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Wed, 17 Jan 2007 07:27:25 +0000
Subject: [PATCH] - Update to 2.18.20061212 - Pet portlint(1)

PR:		ports/108005
Submitted by:	Thomas Abthorpe <thomas at goodking.ca>
---
 science/simlib/Makefile                     |  4 +-
 science/simlib/distinfo                     |  6 +--
 science/simlib/files/patch-Makefile.FreeBSD | 48 +++++++--------------
 science/simlib/pkg-plist                    |  6 +--
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/science/simlib/Makefile b/science/simlib/Makefile
index 534d075682d7..fdaa6db1b7f5 100644
--- a/science/simlib/Makefile
+++ b/science/simlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	simlib
-PORTVERSION=	2.18.20041107
+PORTVERSION=	2.18.20061212
 CATEGORIES=	science
 MASTER_SITES=	http://www.fit.vutbr.cz/~peringer/SIMLIB/source/
 DISTNAME=	SIMLIB-${PORTVERSION:S/.200/-200/}
@@ -16,8 +16,8 @@ COMMENT=	SIMulation LIBrary for C++ programming language
 
 NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 MAKEFILE=	Makefile.FreeBSD
-INSTALL_TARGET=	_install
 
 # not 64bit ready
 ONLY_FOR_ARCHS=	i386
diff --git a/science/simlib/distinfo b/science/simlib/distinfo
index da1cacc6fe12..2d49b4f7e898 100644
--- a/science/simlib/distinfo
+++ b/science/simlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (SIMLIB-2.18-20041107.tar.gz) = c3ea1ca7319be83696e2320121a191f7
-SHA256 (SIMLIB-2.18-20041107.tar.gz) = 665945830637828a78a2b298e5eeb0c64a2fbf9b726fce02ee62cb356e71f333
-SIZE (SIMLIB-2.18-20041107.tar.gz) = 170922
+MD5 (SIMLIB-2.18-20061212.tar.gz) = cbd9680a4b57854f6200419e1e2dafb6
+SHA256 (SIMLIB-2.18-20061212.tar.gz) = 99ea069cf7dde1304ae682275242d21166238cd4353fb3a51892b05de27f4711
+SIZE (SIMLIB-2.18-20061212.tar.gz) = 360454
diff --git a/science/simlib/files/patch-Makefile.FreeBSD b/science/simlib/files/patch-Makefile.FreeBSD
index 5f14ce3ee256..65f5800465b9 100644
--- a/science/simlib/files/patch-Makefile.FreeBSD
+++ b/science/simlib/files/patch-Makefile.FreeBSD
@@ -1,20 +1,21 @@
---- Makefile.FreeBSD.orig	Thu Apr  5 10:50:35 2001
-+++ Makefile.FreeBSD	Fri Nov 26 18:23:34 2004
-@@ -48,20 +48,21 @@
+--- Makefile.FreeBSD.orig	Thu Dec  9 13:39:45 2004
++++ Makefile.FreeBSD	Tue Jan 16 11:50:27 2007
+@@ -52,18 +52,19 @@
  LIBNAME=simlib
  
  # name of the compiler for C and C++ language
 -CC=gcc
--CXX=c++
+-CXX=g++
 +CC?=gcc
-+CXX?=c++
++CXX?=g++
+ #CXX=g++-3.4
  
  # C++ compiler flags -- for development
- #CXXFLAGS=-g -O2 -Wall		# with debug info
+-CXXFLAGS=-g -fPIC -O2		# with debug info
++CXXFLAGS?=-g -fPIC -O2		# with debug info
  #CXXFLAGS=-pg -O2 -Wall		# with profile support
  #CXXFLAGS=-O2 -Wall -Weffc++	# PRODUCTION CODE
--CXXFLAGS=-O2 -Wall         	# PRODUCTION CODE
-+CXXFLAGS?=-O2 -Wall         	# PRODUCTION CODE
+ #CXXFLAGS=-O2 -Wall              # PRODUCTION CODE
  
  # installing program
 -INSTALL=install -m0644
@@ -22,34 +23,17 @@
 +INSTALL_PROGRAM?=install -c -s -m 555
  
  # directory where the files will be installed in
--INSTALLROOT=/usr/local
-+PREFIX?=/usr/local
- 
- # program to remove files
- RM=rm -f
-@@ -315,9 +316,9 @@
- 
+ PREFIX=/usr/local
+@@ -237,9 +238,9 @@
  #TODO: add version and symlink
- _install: all
--	$(INSTALL) $(SIMLIB_HEADERS) $(INSTALLROOT)/include
--	$(INSTALL) $(LIBNAME).a $(INSTALLROOT)/lib/lib$(LIBNAME).a
--	$(INSTALL) $(LIBNAME).so $(INSTALLROOT)/lib/lib$(LIBNAME).so
+ install: all
+ 	echo "You should have permissions to install in " $(PREFIX)/
+-	$(INSTALL) $(SIMLIB_HEADERS) $(PREFIX)/include
+-	$(INSTALL) $(LIBNAME).a $(PREFIX)/lib/lib$(LIBNAME).a
+-	$(INSTALL) $(LIBNAME).so $(PREFIX)/lib/lib$(LIBNAME).so
 +	$(INSTALL_DATA) $(SIMLIB_HEADERS) $(PREFIX)/include
 +	$(INSTALL_PROGRAM) $(LIBNAME).a $(PREFIX)/lib/lib$(LIBNAME).a
 +	$(INSTALL_PROGRAM) $(LIBNAME).so $(PREFIX)/lib/lib$(LIBNAME).so
  
  #############################################################################
  ###############################
-@@ -325,9 +326,9 @@
- ###############################
- 
- uninstall:
--	$(RM) $(foreach headerfile, $(SIMLIB_HEADERS), $(INSTALLROOT)/include/$(headerfile))
--	$(RM) $(INSTALLROOT)/lib/lib$(LIBNAME).a
--	$(RM) $(INSTALLROOT)/lib/lib$(LIBNAME).so
-+	$(RM) $(foreach headerfile, $(SIMLIB_HEADERS), $(PREFIX)/include/$(headerfile))
-+	$(RM) $(PREFIX)/lib/lib$(LIBNAME).a
-+	$(RM) $(PREFIX)/lib/lib$(LIBNAME).so
- 
- #############################################################################
- ###################################
diff --git a/science/simlib/pkg-plist b/science/simlib/pkg-plist
index 82cb293d32ac..5dd67c34e94a 100644
--- a/science/simlib/pkg-plist
+++ b/science/simlib/pkg-plist
@@ -1,8 +1,8 @@
-include/simlib.h
 include/delay.h
-include/zdelay.h
+include/optimize.h
+include/simlib.h
 include/simlib2D.h
 include/simlib3D.h
-include/optimize.h
+include/zdelay.h
 lib/libsimlib.a
 lib/libsimlib.so