4 files changed, 47 insertions, 13 deletions

diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 972a151ba469..d4312056b9fd 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	oregano
-PORTVERSION=	0.22
-PORTREVISION=	1
+PORTVERSION=	0.23
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.codefactory.se/pub/CodeFactory/software/oregano/
 
@@ -16,14 +15,14 @@ MAINTAINER=	anders@hack.org
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/cad/oregano/distinfo b/cad/oregano/distinfo
index caa1304851ae..553d72abff0c 100644
--- a/cad/oregano/distinfo
+++ b/cad/oregano/distinfo
@@ -1 +1 @@
-MD5 (oregano-0.22.tar.gz) = 912f523bb1c814b0f74e10e0b0681bf8
+MD5 (oregano-0.23.tar.gz) = 226b84622dd1b877ee87228ba74d68d1
diff --git a/cad/oregano/files/patch-ltmain.sh b/cad/oregano/files/patch-ltmain.sh
new file mode 100644
index 000000000000..941b2a0c015a
--- /dev/null
+++ b/cad/oregano/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Thu Dec 13 19:09:47 2001
++++ ltmain.sh	Wed Jan 23 01:14:10 2002
+@@ -2412,6 +2412,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4182,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	 if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	 fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index 9cfcfdc0df66..fe77c6335993 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -1,13 +1,5 @@
 bin/oregano
 bin/pspice2oregano
-share/locale/ca/LC_MESSAGES/oregano.mo
-share/locale/de/LC_MESSAGES/oregano.mo
-share/locale/es/LC_MESSAGES/oregano.mo
-share/locale/fr/LC_MESSAGES/oregano.mo
-share/locale/it/LC_MESSAGES/oregano.mo
-share/locale/ja/LC_MESSAGES/oregano.mo
-share/locale/ro/LC_MESSAGES/oregano.mo
-share/locale/sv/LC_MESSAGES/oregano.mo
 share/gnome/oregano/glade/part-browser.glade
 share/gnome/oregano/glade/settings.glade
 share/gnome/oregano/glade/sim-settings.glade
@@ -24,8 +16,16 @@ share/gnome/oregano/samples/zener.oregano
 share/gnome/oregano/samples/555.oregano
 share/gnome/oregano/samples/OP177B.oregano
 share/gnome/oregano/samples/transistors.oregano
+share/gnome/oregano/libraries/cmos.oreglib
+share/gnome/oregano/libraries/cpu.oreglib
 share/gnome/oregano/libraries/default.oreglib
+share/gnome/oregano/libraries/interface.oreglib
+share/gnome/oregano/libraries/linear.oreglib
+share/gnome/oregano/libraries/memory.oreglib
+share/gnome/oregano/libraries/miscellaneous.oreglib
 share/gnome/oregano/libraries/opamplib.oreglib
+share/gnome/oregano/libraries/peripheral.oreglib
+share/gnome/oregano/libraries/power.oreglib
 share/gnome/oregano/libraries/ttl.oreglib
 share/gnome/oregano/models/12AX7A.model
 share/gnome/oregano/models/TLC555.model
@@ -41,6 +41,16 @@ share/gnome/apps/Applications/oregano.desktop
 share/gnome/mime-info/oregano.keys
 share/gnome/mime-info/oregano.mime
 share/gnome/pixmaps/gnome-oregano.png
+share/locale/ca/LC_MESSAGES/oregano.mo
+share/locale/de/LC_MESSAGES/oregano.mo
+share/locale/es/LC_MESSAGES/oregano.mo
+share/locale/fr/LC_MESSAGES/oregano.mo
+share/locale/it/LC_MESSAGES/oregano.mo
+share/locale/ja/LC_MESSAGES/oregano.mo
+share/locale/pt_BR/LC_MESSAGES/oregano.mo
+share/locale/ro/LC_MESSAGES/oregano.mo
+share/locale/ru/LC_MESSAGES/oregano.mo
+share/locale/sv/LC_MESSAGES/oregano.mo
 @dirrm share/gnome/oregano/glade
 @dirrm share/gnome/oregano/samples
 @dirrm share/gnome/oregano/libraries