summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/glest-data/Makefile8
-rw-r--r--games/glest-data/distinfo6
-rw-r--r--games/glest/Makefile34
-rw-r--r--games/glest/distinfo6
-rw-r--r--games/glest/files/glest-wrapper.in5
-rw-r--r--games/glest/files/patch-mk__linux__autogen.sh4
6 files changed, 36 insertions, 27 deletions
diff --git a/games/glest-data/Makefile b/games/glest-data/Makefile
index d93289687311..d6b30b0b2cbe 100644
--- a/games/glest-data/Makefile
+++ b/games/glest-data/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= data
-PORTVERSION= 3.1.2
+PORTVERSION= 3.2.1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= glest
@@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/glest_game
DATADIR= share/${PKGNAMEPREFIX:S/-//}
DOCSDIR= share/doc/${PKGNAMEPREFIX:S/-//}
-GLESTDATADIRE= data maps scenarios techs tilesets
+GLESTDATADIRE= data maps scenarios techs tilesets tutorials
post-extract:
@${MV} ${WRKSRC}/docs/license.txt ${WRKSRC}/docs/license-data.txt
@@ -35,7 +35,7 @@ post-extract:
pre-install:
@${RM} -f ${PLIST}
-. for FILE in configuration.xml glest.ico glest_irc.url glest_web.url servers.ini
+. for FILE in glest.ico servers.ini
@${ECHO_CMD} "%%DATADIR%%/${FILE}" >> ${PLIST}
. endfor
@@ -60,7 +60,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${PREFIX}/${DOCSDIR}
.endif
@${MKDIR} ${PREFIX}/${DATADIR}
-.for FILE in configuration.xml glest.ico glest_irc.url glest_web.url servers.ini
+.for FILE in glest.ico servers.ini
${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${DATADIR}
.endfor
diff --git a/games/glest-data/distinfo b/games/glest-data/distinfo
index 760619ef320f..b89131990f96 100644
--- a/games/glest-data/distinfo
+++ b/games/glest-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (glest/glest_data_3.1.2.zip) = 0b1d463c6c7a838d8737728eaff07a81
-SHA256 (glest/glest_data_3.1.2.zip) = 2b35b1cfe7af2513c6c18ef2ab5b27b8334bb6558def92eef4ad48a99cea7a59
-SIZE (glest/glest_data_3.1.2.zip) = 65751462
+MD5 (glest/glest_data_3.2.1.zip) = d67de58e0912925e8ddbd0b25a0d2b50
+SHA256 (glest/glest_data_3.2.1.zip) = 5a0660ed103a93d641397980c1e4860d5a0cfcd166256d3f8f6a28c13b457bf1
+SIZE (glest/glest_data_3.2.1.zip) = 69967380
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 739aa99d523e..bd471788786f 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= glest
-PORTVERSION= 3.1.2
+PORTVERSION= 3.2.1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-source-${PORTVERSION}
+DISTNAME= ${PORTNAME}_source_${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= acm@FreeBSD.org
@@ -21,14 +21,16 @@ LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
openal.0:${PORTSDIR}/audio/openal \
alut.1:${PORTSDIR}/audio/freealut
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
-RUN_DEPENDS= ${DATADIR}/configuration.xml:${PORTSDIR}/games/glest-data
+RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
USE_AUTOTOOLS= automake:15:env autoconf:262:env
-USE_BZIP2= yes
+USE_ZIP= yes
USE_DOS2UNIX= yes
+USE_LUA= 5.1
USE_SDL= yes
USE_GL= yes
GNU_CONFIGURE= yes
+CONFIGURE_SCRIPT= mk/linux/configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
SUB_FILES= glest-wrapper pkg-message
@@ -37,6 +39,8 @@ JAM_CMD= ${LOCALBASE}/bin/jam -qa
OPTIONS= EDITOR "Build map editor" off
+EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME}
+
.include <bsd.port.pre.mk>
.if defined(WITH_EDITOR)
@@ -49,17 +53,23 @@ HAVE_EDITOR= true
PLIST_SUB+= EDITOR="@comment "
.endif
+pre-extract:
+ @${MKDIR} ${WRKDIR}/${DISTNAME}
+
post-patch:
@${REINPLACE_CMD} -e "s|%%ACLOCAL%%|${ACLOCAL}|g" -e "s|%%AUTOCONF%%|${AUTOCONF}|g" \
- ${WRKSRC}/autogen.sh
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="${PTHREAD_LIBS}"|g ; \
- s|pthreads library -l[$$]flag|pthreads library ${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure.ac ${WRKSRC}/mk/autoconf/*
+ ${WRKSRC}/mk/linux/autogen.sh
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' -e \
+ 's|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="${PTHREAD_LIBS}"|g' -e \
+ 's|pthreads library -l[$$]flag|pthreads library ${PTHREAD_LIBS}|g' -e \
+ 's|include/lua5.1|include/lua51|g' -e 's|-llua5.1|-llua-5.1|g' \
+ ${WRKSRC}/mk/linux/configure.ac ${WRKSRC}/mk/linux/mk/autoconf/*
@${FIND} -E ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | ${XARGS} ${RM}
pre-configure:
- @cd ${WRKSRC} && ${SH} autogen.sh
+ @cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \
+ ${REINPLACE_CMD} -e 's|-llua5.1|-llua-5.1|g' -e 's|.lng||g' \
+ ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/mk/linux/glest.ini
do-build:
@cd ${WRKSRC} && ${JAM_CMD}
@@ -67,11 +77,11 @@ do-build:
do-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/license-game.txt
+ ${INSTALL_DATA} ${WRKSRC}/docs/license.txt ${DOCSDIR}/license-game.txt
.endif
@${MKDIR} ${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/glest ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/glest.ini ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/mk/linux/glest.ini ${DATADIR}
${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${PREFIX}/bin/${PORTNAME}
.if defined(HAVE_EDITOR)
diff --git a/games/glest/distinfo b/games/glest/distinfo
index d30d7721c362..7aa962b71a94 100644
--- a/games/glest/distinfo
+++ b/games/glest/distinfo
@@ -1,3 +1,3 @@
-MD5 (glest/glest-source-3.1.2.tar.bz2) = e72ec79dacdf7ff5a27c2f5b74ffc01e
-SHA256 (glest/glest-source-3.1.2.tar.bz2) = bc96a78dd86f240568d230fd4dd6b69bca8922ba673b4d1138e09d1ad88fbfdf
-SIZE (glest/glest-source-3.1.2.tar.bz2) = 388086
+MD5 (glest/glest_source_3.2.1.zip) = 1803335a1c30aca5c73680199a9daf8b
+SHA256 (glest/glest_source_3.2.1.zip) = 4a2a5aed05f2dbebd43b0fb46f5c200bd2cca359aafe8ca2d72aef792e9ee270
+SIZE (glest/glest_source_3.2.1.zip) = 574433
diff --git a/games/glest/files/glest-wrapper.in b/games/glest/files/glest-wrapper.in
index 7bc6873afc5b..2a556ec0e0e4 100644
--- a/games/glest/files/glest-wrapper.in
+++ b/games/glest/files/glest-wrapper.in
@@ -15,11 +15,10 @@ else
mkdir -p ~/.glest/screens
mkdir -p ~/.glest/shaders/standard
touch ~/.glest/glest.log
- rm ~/.glest/glest.ini ~/.glest/configuration.xml ~/.glest/glest
- rm ~/.glest/servers.ini
- cp -f %%DATADIR%%/configuration.xml ~/.glest/
+ rm ~/.glest/glest.ini ~/.glest/glest ~/.glest/servers.ini
cp -f %%DATADIR%%/glest.ini ~/.glest/
cp -f %%DATADIR%%/servers.ini ~/.glest/
+ chmod 640 ~/.glest/glest.ini ~/.glest/servers.ini
fi
cd ~/.glest || exit 1
diff --git a/games/glest/files/patch-mk__linux__autogen.sh b/games/glest/files/patch-mk__linux__autogen.sh
index ec4f473eed6d..3332c2521a17 100644
--- a/games/glest/files/patch-mk__linux__autogen.sh
+++ b/games/glest/files/patch-mk__linux__autogen.sh
@@ -1,5 +1,5 @@
---- autogen.sh.orig Thu Dec 1 09:52:33 2005
-+++ autogen.sh Thu Dec 1 09:53:14 2005
+--- mk/linux/autogen.sh Thu Dec 1 09:52:33 2005
++++ mk/linux/autogen.sh Thu Dec 1 09:53:14 2005
@@ -8,11 +8,11 @@
echo "aclocal..."
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 00:19:07 +0000