3 files changed, 41 insertions, 13 deletions

diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 90e1e6ef03f8..d5a63d25416b 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -7,35 +7,47 @@
 #
 
 PORTNAME=	goblin
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.math.uni-augsburg.de/opt/goblin.docs/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Graph Object Library for Network Programming Problems
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
+CONFLICTS=	ImageMagick-[0-9]* display-*
+
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
+MAKE_ARGS=	CC="${CC}" CCFLAGS="${CFLAGS}" \
+		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		LD="${CXX}" LIBS="-lm ${LDFLAGS}" LISShared="-lm ${LDFLAGS}" \
+		libtcl=83 libtk=83 prefix=${PREFIX}
+ALL_TARGET=	all goblin.a glpk.a
 PLIST_SUB+=	VERSION=${PORTVERSION:R}
 
 CFLAGS+=	-I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 \
 		-I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
 
+WISH=		${LOCALBASE}/bin/wish8.3
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+CXXFLAGS+=	-fhuge-objects
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|g++ -c .* -Iinclude|$$(CXX) -c $$(CXXFLAGS) -Iinclude|g ; \
-		 s|g++ -lm|$$(CXX) -lm $$(LDFLAGS)|g ; \
-		 s|8\.3|83|g ; \
-		 s|/usr/include|$$(PREFIX)/include|g ; \
-		 s|/usr/lib|$$(PREFIX)/lib|g ; \
-		 s|/usr/bin|$$(PREFIX)/bin|g ; \
-		 s|-lpthread||g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/display
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
-.include <bsd.port.mk>
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/gosh
+
+.include <bsd.port.post.mk>
diff --git a/math/goblin/distinfo b/math/goblin/distinfo
index 58555b3cb776..9c3e6db6d1b0 100644
--- a/math/goblin/distinfo
+++ b/math/goblin/distinfo
@@ -1 +1 @@
-MD5 (goblin.2.6.1.tar.gz) = 7c4a7809d4bf93fdd23b559f06bea55a
+MD5 (goblin.2.6.2.tgz) = e206f4d920480103d0c0698626dcf77b
diff --git a/math/goblin/pkg-plist b/math/goblin/pkg-plist
index 558dfe2a815e..2c0114cb07d3 100644
--- a/math/goblin/pkg-plist
+++ b/math/goblin/pkg-plist
@@ -24,6 +24,7 @@ bin/goblin.%%VERSION%%/editConstants.tk
 bin/goblin.%%VERSION%%/editDelete.gif
 bin/goblin.%%VERSION%%/editDelete.tk
 bin/goblin.%%VERSION%%/editExtract.tk
+bin/goblin.%%VERSION%%/editIncidences.gif
 bin/goblin.%%VERSION%%/editLabel.gif
 bin/goblin.%%VERSION%%/editMetrics.tk
 bin/goblin.%%VERSION%%/editMove.gif
@@ -48,6 +49,9 @@ bin/goblin.%%VERSION%%/fileSaveAs.tk
 bin/goblin.%%VERSION%%/foldClose.gif
 bin/goblin.%%VERSION%%/foldOpen.gif
 bin/goblin.%%VERSION%%/gobletTitle.gif
+bin/goblin.%%VERSION%%/infoAuthors.tk
+bin/goblin.%%VERSION%%/infoBibliography.tk
+bin/goblin.%%VERSION%%/infoModules.tk
 bin/goblin.%%VERSION%%/infoRessources.tk
 bin/goblin.%%VERSION%%/infoStatistics.tk
 bin/goblin.%%VERSION%%/infoTimers.tk
@@ -55,7 +59,6 @@ bin/goblin.%%VERSION%%/layoutArcs.tk
 bin/goblin.%%VERSION%%/layoutLPOpt.tk
 bin/goblin.%%VERSION%%/layoutMeasures.tk
 bin/goblin.%%VERSION%%/layoutNodes.tk
-bin/goblin.%%VERSION%%/layoutStyle.tk
 bin/goblin.%%VERSION%%/lightsGreen.gif
 bin/goblin.%%VERSION%%/lightsRed.gif
 bin/goblin.%%VERSION%%/lightsYellow.gif
@@ -84,6 +87,8 @@ bin/goblin.%%VERSION%%/msgWarn.gif
 bin/goblin.%%VERSION%%/optimizeDataStruct.tk
 bin/goblin.%%VERSION%%/optimizeLevel.tk
 bin/goblin.%%VERSION%%/optimizeMethods.tk
+bin/goblin.%%VERSION%%/placeNodes.tk
+bin/goblin.%%VERSION%%/planarity.tk
 bin/goblin.%%VERSION%%/samples/acyclic.gob
 bin/goblin.%%VERSION%%/samples/adlittle.gob
 bin/goblin.%%VERSION%%/samples/afiro.gob
@@ -193,6 +198,8 @@ bin/goblin.%%VERSION%%/samples/optmatch8.gob
 bin/goblin.%%VERSION%%/samples/optmatch9.gob
 bin/goblin.%%VERSION%%/samples/petersen.gob
 bin/goblin.%%VERSION%%/samples/planar1.gob
+bin/goblin.%%VERSION%%/samples/planar2.gob
+bin/goblin.%%VERSION%%/samples/planar3.gob
 bin/goblin.%%VERSION%%/samples/postman1.gob
 bin/goblin.%%VERSION%%/samples/postman2.gob
 bin/goblin.%%VERSION%%/samples/postman3.gob
@@ -220,6 +227,7 @@ bin/goblin.%%VERSION%%/samples/tile3.gob
 bin/goblin.%%VERSION%%/samples/tile4.gob
 bin/goblin.%%VERSION%%/samples/tile5.gob
 bin/goblin.%%VERSION%%/samples/tile6.gob
+bin/goblin.%%VERSION%%/samples/tile7.gob
 bin/goblin.%%VERSION%%/samples/tjoin1.gob
 bin/goblin.%%VERSION%%/samples/tjoin2.gob
 bin/goblin.%%VERSION%%/samples/tjoin3.gob
@@ -247,6 +255,7 @@ bin/goblin.%%VERSION%%/tclLogo.gif
 bin/goblin.%%VERSION%%/toggleBrowser.gif
 bin/goblin.%%VERSION%%/toggleEditor.gif
 bin/goblin.%%VERSION%%/toggleScript.gif
+bin/goblin.%%VERSION%%/~optimizeMethods.tk
 bin/gosh
 include/goblin.%%VERSION%%/absbal.h
 include/goblin.%%VERSION%%/absbig.h
@@ -255,6 +264,7 @@ include/goblin.%%VERSION%%/absfam.h
 include/goblin.%%VERSION%%/absgra.h
 include/goblin.%%VERSION%%/absmix.h
 include/goblin.%%VERSION%%/absobj.h
+include/goblin.%%VERSION%%/abstractSubgraph.h
 include/goblin.%%VERSION%%/auxnet.h
 include/goblin.%%VERSION%%/bal2bal.h
 include/goblin.%%VERSION%%/basheap.h
@@ -265,8 +275,10 @@ include/goblin.%%VERSION%%/bbstable.h
 include/goblin.%%VERSION%%/bbstsp.h
 include/goblin.%%VERSION%%/big2fnw.h
 include/goblin.%%VERSION%%/binheap.h
+include/goblin.%%VERSION%%/complement.h
 include/goblin.%%VERSION%%/config.h
 include/goblin.%%VERSION%%/context.h
+include/goblin.%%VERSION%%/deleteNode.h
 include/goblin.%%VERSION%%/dictionary.h
 include/goblin.%%VERSION%%/display.h
 include/goblin.%%VERSION%%/dnsbig.h
@@ -284,6 +296,7 @@ include/goblin.%%VERSION%%/fnw2fnw.h
 include/goblin.%%VERSION%%/genincl.h
 include/goblin.%%VERSION%%/genstruc.h
 include/goblin.%%VERSION%%/globals.h
+include/goblin.%%VERSION%%/glpkWrap.h
 include/goblin.%%VERSION%%/goblin.h
 include/goblin.%%VERSION%%/gosh.h
 include/goblin.%%VERSION%%/gra2bal.h
@@ -295,6 +308,7 @@ include/goblin.%%VERSION%%/lpSolve.h
 include/goblin.%%VERSION%%/matrix.h
 include/goblin.%%VERSION%%/messenger.h
 include/goblin.%%VERSION%%/queue.h
+include/goblin.%%VERSION%%/segment.h
 include/goblin.%%VERSION%%/setfam.h
 include/goblin.%%VERSION%%/shrfam.h
 include/goblin.%%VERSION%%/shrnet.h
@@ -307,9 +321,11 @@ include/goblin.%%VERSION%%/spsmix.h
 include/goblin.%%VERSION%%/spsstruc.h
 include/goblin.%%VERSION%%/statq.h
 include/goblin.%%VERSION%%/statstaq.h
+include/goblin.%%VERSION%%/subgraph.h
 include/goblin.%%VERSION%%/surgra.h
 include/goblin.%%VERSION%%/timers.h
 include/goblin.%%VERSION%%/treeView.h
+lib/libglpk.a
 lib/libgoblin%%VERSION%%.a
 @dirrm include/goblin.%%VERSION%%
 @dirrm bin/goblin.%%VERSION%%/samples