4 files changed, 32 insertions, 66 deletions

diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index f837631738a2..8ef5ae980fd2 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -9,24 +9,16 @@ PORTNAME=	oregano
 PORTVERSION=	0.23
 PORTREVISION=	1
 CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.codefactory.se/pub/CodeFactory/software/oregano/
+MASTER_SITES=	http://people.imendio.com/richard/oregano/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Schematic capture and simulation of electrical circuits
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnomeprefix gnomeprint libglade
+USE_GMAKE=	yes
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\(\$$(datadir)/\)gnome/|\1|g ; \
-		s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/cad/oregano/files/patch-ltmain.sh b/cad/oregano/files/patch-ltmain.sh
deleted file mode 100644
index 941b2a0c015a..000000000000
--- a/cad/oregano/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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-descr b/cad/oregano/pkg-descr
index 39d095ea36ba..5817c531f661 100644
--- a/cad/oregano/pkg-descr
+++ b/cad/oregano/pkg-descr
@@ -1,6 +1,5 @@
-Oregano is a tool for schematic capture and simulation
-of electrical circuits. It simplifies design of simple circuits
-by letting the user draw the circuit and then simulate its
-electrical characteristics.
+Oregano is a tool for schematic capture and simulation of electrical
+circuits.  It simplifies design of simple circuits by letting the user
+draw the circuit and then simulate its electrical characteristics.
 
-WWW: http://oregano.codefactory.se/
+WWW: http://people.imendio.com/richard/oregano/
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index fe77c6335993..1e25b97b395d 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -1,21 +1,21 @@
 bin/oregano
 bin/pspice2oregano
+share/gnome/apps/Applications/oregano.desktop
+share/gnome/help/oregano/C/editing.html
+share/gnome/help/oregano/C/oregano.html
+share/gnome/help/oregano/C/simulation.html
+share/gnome/help/oregano/C/topic.dat
+share/gnome/mime-info/oregano.keys
+share/gnome/mime-info/oregano.mime
+share/gnome/oregano/glade/log-window.glade
 share/gnome/oregano/glade/part-browser.glade
-share/gnome/oregano/glade/settings.glade
-share/gnome/oregano/glade/sim-settings.glade
 share/gnome/oregano/glade/part-properties-dialog.glade
-share/gnome/oregano/glade/textbox-properties-dialog.glade
 share/gnome/oregano/glade/plot-window.glade
-share/gnome/oregano/glade/log-window.glade
+share/gnome/oregano/glade/settings.glade
+share/gnome/oregano/glade/sim-settings.glade
 share/gnome/oregano/glade/simulation.glade
 share/gnome/oregano/glade/summary.glade
-share/gnome/oregano/samples/12ax7a.oregano
-share/gnome/oregano/samples/741.oregano
-share/gnome/oregano/samples/opamp.oregano
-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/glade/textbox-properties-dialog.glade
 share/gnome/oregano/libraries/cmos.oreglib
 share/gnome/oregano/libraries/cpu.oreglib
 share/gnome/oregano/libraries/default.oreglib
@@ -28,18 +28,18 @@ 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
-share/gnome/oregano/models/UA741.model
 share/gnome/oregano/models/1N750.model
-share/gnome/oregano/models/PNP.model
 share/gnome/oregano/models/NPN.model
-share/gnome/help/oregano/C/topic.dat
-share/gnome/help/oregano/C/oregano.html
-share/gnome/help/oregano/C/editing.html
-share/gnome/help/oregano/C/simulation.html
-share/gnome/apps/Applications/oregano.desktop
-share/gnome/mime-info/oregano.keys
-share/gnome/mime-info/oregano.mime
+share/gnome/oregano/models/PNP.model
+share/gnome/oregano/models/TLC555.model
+share/gnome/oregano/models/UA741.model
+share/gnome/oregano/samples/12ax7a.oregano
+share/gnome/oregano/samples/555.oregano
+share/gnome/oregano/samples/741.oregano
+share/gnome/oregano/samples/OP177B.oregano
+share/gnome/oregano/samples/opamp.oregano
+share/gnome/oregano/samples/transistors.oregano
+share/gnome/oregano/samples/zener.oregano
 share/gnome/pixmaps/gnome-oregano.png
 share/locale/ca/LC_MESSAGES/oregano.mo
 share/locale/de/LC_MESSAGES/oregano.mo
@@ -51,10 +51,10 @@ 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
 @dirrm share/gnome/oregano/models
+@dirrm share/gnome/oregano/libraries
+@dirrm share/gnome/oregano/glade
 @dirrm share/gnome/oregano
 @dirrm share/gnome/help/oregano/C
 @dirrm share/gnome/help/oregano