4 files changed, 23 insertions, 15 deletions

diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 856cfbc76203..e9cbbecfc175 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	goblin
-DISTVERSION=	2.8b28
+DISTVERSION=	2.8b30
 CATEGORIES=	math
-MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}2/${PORTNAME}.2.8b28
+MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}2/${PORTNAME}.${DISTVERSION}
 DISTNAME=	${PORTNAME}.${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
@@ -25,7 +25,7 @@ MAKE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		LD="${CXX}" LIBS="-lm ${LDFLAGS}" LISShared="-lm ${LDFLAGS}" \
 		libtcl=84 libtk=84 prefix=${PREFIX}
-ALL_TARGET=	all
+ALL_TARGET=	all shared
 PLIST_SUB+=	VERSION=${PORTVERSION:R}
 
 CFLAGS+=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/ \
@@ -46,15 +46,17 @@ post-patch:
 		's|malloc\.h|stdlib.h|g'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gosh ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/goblet ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gosh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/goblet ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/display ${PREFIX}/bin/goblin-display
 	${INSTALL} -d ${PREFIX}/include/${PORTNAME}
 	(cd ${WRKSRC}/include && ${COPYTREE_SHARE} \*.h ${PREFIX}/include/${PORTNAME})
 	${INSTALL} -d ${PREFIX}/lib/${PORTNAME}
 	(cd ${WRKSRC}/tcl && ${COPYTREE_SHARE} \* ${PREFIX}/lib/${PORTNAME})
-	${INSTALL_DATA} ${WRKSRC}/libglpk.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libgoblin.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libglpk.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libgoblin.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libglpk.so ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libgoblin.so ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d ${DOCSDIR}
 	${INSTALL} -d ${DOCSDIR}/html
diff --git a/math/goblin/distinfo b/math/goblin/distinfo
index 4f477c99a2d1..2c76967a90d1 100644
--- a/math/goblin/distinfo
+++ b/math/goblin/distinfo
@@ -1,3 +1,3 @@
-MD5 (goblin.2.8b28.tgz) = eed273cb6cc226d147431f0ee7992b99
-SHA256 (goblin.2.8b28.tgz) = 04a99060a73ef19b7bd97d63cd7faa50010a85207f894b36ef7376909988e124
-SIZE (goblin.2.8b28.tgz) = 1731322
+MD5 (goblin.2.8b30.tgz) = cfe86a6cce6f2a1e5239c1f4a55a56ea
+SHA256 (goblin.2.8b30.tgz) = 3ceec6e051911e494ec1003de08d7e519e4c1987cac0d04510fd4901a56fc050
+SIZE (goblin.2.8b30.tgz) = 1756142
diff --git a/math/goblin/files/patch-Makefile b/math/goblin/files/patch-Makefile
index 926a1519eb0d..e066327156cb 100644
--- a/math/goblin/files/patch-Makefile
+++ b/math/goblin/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2008-05-05 07:51:22.000000000 +0200
-+++ Makefile	2008-05-31 02:28:31.000000000 +0200
-@@ -318,19 +318,11 @@
+--- Makefile.orig	2010-05-28 10:41:25.000000000 +0000
++++ Makefile	2010-05-28 10:41:41.000000000 +0000
+@@ -335,19 +335,11 @@
  shared : intro $(shared_objects)
  
  libgoblin.$(so_suffix) : $(lib_objects) $(shell_objects)
@@ -20,10 +20,10 @@
  	@echo "...Shared object ($@) has been successfully linked"
  
  
-@@ -349,11 +341,7 @@
+@@ -367,11 +359,7 @@
  else
  
- gosh : $(gosh_objects) $(shared_objects) 
+ gosh : $(gosh_objects) $(shared_objects)
 -ifeq ($(CC),gcc)
  	$(LD)    -o $@ $(gosh_objects) -L. $(LDFLAGS) -lgoblin $(glpk) $(LIBS)
 -else
diff --git a/math/goblin/pkg-plist b/math/goblin/pkg-plist
index ec2f9b050732..e081dfaca222 100644
--- a/math/goblin/pkg-plist
+++ b/math/goblin/pkg-plist
@@ -47,6 +47,7 @@ include/goblin/goblin.h
 include/goblin/goblinController.h
 include/goblin/goblinQueue.h
 include/goblin/gosh.h
+include/goblin/graphDisplayProxy.h
 include/goblin/graphInclude.h
 include/goblin/graphRepresentation.h
 include/goblin/graphToBalanced.h
@@ -61,8 +62,10 @@ include/goblin/matrix.h
 include/goblin/messenger.h
 include/goblin/mixedGraph.h
 include/goblin/moduleGuard.h
+include/goblin/movingLineModel.h
 include/goblin/nestedFamily.h
 include/goblin/networkSimplex.h
+include/goblin/orthogonalGrid.h
 include/goblin/segment.h
 include/goblin/sequentialQueue.h
 include/goblin/sequentialStack.h
@@ -74,6 +77,7 @@ include/goblin/sparseInclude.h
 include/goblin/sparseRepresentation.h
 include/goblin/staticQueue.h
 include/goblin/staticStack.h
+include/goblin/stripeDissectionModel.h
 include/goblin/subgraph.h
 include/goblin/surfaceGraph.h
 include/goblin/switchBaseTypes.h
@@ -221,7 +225,9 @@ lib/goblin/toggleBrowser.gif
 lib/goblin/toggleEditor.gif
 lib/goblin/toggleScript.gif
 lib/libglpk.a
+lib/libglpk.so
 lib/libgoblin.a
+lib/libgoblin.so
 %%PORTDOCS%%%%DOCSDIR%%/auxiliary1.eps
 %%PORTDOCS%%%%DOCSDIR%%/auxiliary2.eps
 %%PORTDOCS%%%%DOCSDIR%%/bipartite1.eps