Update to 4.25.

Install more headers.

PR:		119662
Submitted by:	bf <bf2006a@yahoo.com>

3 files changed, 39 insertions, 22 deletions

diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 289c28bd8533..0705112a004b 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glpk
-PORTVERSION=	4.24
+PORTVERSION=	4.25
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	glpk
@@ -17,26 +17,23 @@ COMMENT=	A GNU Linear Programming Kit
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-trigraphs
-
-GMPL_H= 	glpavl.h glpdmp.h glplib.h glpmpl.h glprng.h glpstd.h
-GMPLDIR=	${LOCALBASE}/include/gmpl
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	bench.txt bench1.txt glpk.ps glpk_faq.txt gmpl.ps opb.txt
+PORTDOCS=	bench.txt bench1.txt glpk.ps glpk_faq.txt gmpl.ps \
+		gomory.djvu opb.txt
 .endif
 
 post-install:
-	@${MKDIR} ${GMPLDIR}
-	for incfile in ${GMPL_H} ; do \
-		${INSTALL_DATA} ${WRKSRC}/include/$${incfile} ${GMPLDIR} ; \
-	done
+	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
 
 .if !defined(NOPORTDOCS)
+	@${CP} ${WRKSRC}/doc/memo/gomory.djvu ${WRKSRC}/doc/
 	@${MKDIR} ${DOCSDIR}
 	for docfile in ${PORTDOCS} ; do \
 		${INSTALL_MAN} ${WRKSRC}/doc/$${docfile} ${DOCSDIR} ; \
diff --git a/math/glpk/distinfo b/math/glpk/distinfo
index 99025f7e99af..7e215bc27f4d 100644
--- a/math/glpk/distinfo
+++ b/math/glpk/distinfo
@@ -1,3 +1,3 @@
-MD5 (glpk-4.24.tar.gz) = 765dcecc20dc6b80362e65c755f41976
-SHA256 (glpk-4.24.tar.gz) = 23326c9dd21762159b6fa946e41e0e95d233c6e9f9a69134ef10e3541cd516c9
-SIZE (glpk-4.24.tar.gz) = 1449575
+MD5 (glpk-4.25.tar.gz) = 3bd85385acb1123a2b62420af45bcc39
+SHA256 (glpk-4.25.tar.gz) = a178a5ac51d4f344090bd71782f229c7cf69ba86f185c494f57a61d6f2948841
+SIZE (glpk-4.25.tar.gz) = 1487597
diff --git a/math/glpk/pkg-plist b/math/glpk/pkg-plist
index 68d08025673e..2ed84592fd9e 100644
--- a/math/glpk/pkg-plist
+++ b/math/glpk/pkg-plist
@@ -1,13 +1,33 @@
 bin/glpsol
+include/glpapi.h
+include/glpavl.h
+include/glpbfd.h
+include/glpbfx.h
+include/glpdmp.h
+include/glpfhv.h
+include/glpgmp.h
+include/glphbm.h
+include/glpios.h
+include/glpipm.h
+include/glpipp.h
 include/glpk.h
-include/gmpl/glpavl.h
-include/gmpl/glpdmp.h
-include/gmpl/glplib.h
-include/gmpl/glpmpl.h
-include/gmpl/glprng.h
-include/gmpl/glpstd.h
-@dirrm include/gmpl
+include/glplib.h
+include/glplpf.h
+include/glplpp.h
+include/glpluf.h
+include/glplux.h
+include/glpmat.h
+include/glpmpl.h
+include/glppds.h
+include/glpqmd.h
+include/glprng.h
+include/glpscf.h
+include/glpscg.h
+include/glpspx.h
+include/glpssx.h
+include/glpstd.h
+include/glptsp.h
 lib/libglpk.a
 lib/libglpk.la
 lib/libglpk.so
-lib/libglpk.so.9
+lib/libglpk.so.10