1 files changed, 40 insertions, 22 deletions

diff --git a/math/goblin/Makefile b/math/goblin/Makefile
index 0bfb1049ca30..5b537d07b69b 100644
--- a/math/goblin/Makefile
+++ b/math/goblin/Makefile
@@ -7,37 +7,32 @@
 #
 
 PORTNAME=	goblin
-PORTVERSION=	2.6.4
-PORTREVISION=	2
+DISTVERSION=	2.8b22
 CATEGORIES=	misc
-MASTER_SITES=	http://www.math.uni-augsburg.de/~fremuth/goblin.docs/  \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	miwi
-DISTNAME=	${PORTNAME}.${PORTVERSION}
+MASTER_SITES=	SF/goblin2
+DISTNAME=	${PORTNAME}.${DISTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@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_TK=	84
+USE_TCL=	84
 USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GCC=	3.2
+USE_LDCONFIG=	yes
 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
+		libtcl=84 libtk=84 prefix=${PREFIX}
+ALL_TARGET=	all
 PLIST_SUB+=	VERSION=${PORTVERSION:R}
 
-CFLAGS+=	-I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/ \
-		${PTHREAD_CFLAGS} -I${LOCALBASE}/include/tk8.3
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/ \
+		-I${LOCALBASE}/include/tk8.4 ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -ltcl84 -ltk84 ${PTHREAD_LIBS}
 
-WISH=		${LOCALBASE}/bin/wish8.3
+WISH=		${LOCALBASE}/bin/wish8.4
 
 .include <bsd.port.pre.mk>
 
@@ -46,12 +41,35 @@ CXXFLAGS+=	-fhuge-objects
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/display
+	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|g' ${WRKSRC}/display
+	${REINPLACE_CMD} -e 's|%%WISH%%|${WISH}|g;s|%%PREFIX%%|${PREFIX}|g' \
+	    ${WRKSRC}/Makefile.conf
+	${REINPLACE_CMD} -e 's|\./gosh|${PREFIX}/bin/gosh|; \
+	    s|\[pwd\] tcl|${PREFIX}/lib/goblin|g' \
+	    ${WRKSRC}/goblet
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/gosh
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gosh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/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
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d ${DOCSDIR}
+	${INSTALL} -d ${DOCSDIR}/html
+	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/html)
+	(cd ${WRKSRC}/doku && ${COPYTREE_SHARE} \* ${DOCSDIR})
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${INSTALL} -d ${EXAMPLESDIR}
+	(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+.endif
 
 .include <bsd.port.post.mk>