diff -urN /usr/ports/games/lgeneral/Makefile games/lgeneral/Makefile --- /usr/ports/games/lgeneral/Makefile 2010-01-30 20:36:36.000000000 +0900 +++ games/lgeneral/Makefile 2010-10-15 04:11:54.000000000 +0900 @@ -6,22 +6,48 @@ # PORTNAME= lgeneral -PORTVERSION= 1.1.1 -PORTREVISION= 7 +PORTVERSION= 1.2 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-engine/1.1 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A turn-based strategy engine inspired by Panzer General USE_SDL= sdl +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -.ifndef (WITHOUT_SOUND) -USE_SDL= mixer -.else +MAN1= lgc-pg.1 +MAN6= lgeneral.6 + +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + +.if defined(WITHOUT_SOUND) CONFIGURE_ARGS+=--disable-sound +.else +USE_SDL+= mixer .endif -GNU_CONFIGURE= yes +.if defined(WITHOUT_NLS) +CONFIGURE_ENV+= am_cv_func_iconv=no +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-g -Wall|-Wall| ; \ + s|/games||' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/icons|/pixmaps|' ${WRKSRC}/Makefile.in + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.* ${DOCSDIR} +.endif .include diff -urN /usr/ports/games/lgeneral/distinfo games/lgeneral/distinfo --- /usr/ports/games/lgeneral/distinfo 2006-01-22 22:04:25.000000000 +0900 +++ games/lgeneral/distinfo 2010-10-05 05:22:44.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (lgeneral-1.1.1.tar.gz) = 18b88069c91e7e7c75cc44a9aa90d0d9 -SHA256 (lgeneral-1.1.1.tar.gz) = 182513e8662251fabbaa782c575b2d96d8d135f20892c3a58112f755c82f9a8b -SIZE (lgeneral-1.1.1.tar.gz) = 588698 +MD5 (lgeneral-1.2.tar.gz) = a34eae8bc2c05cfa81fe9a9994988613 +SHA256 (lgeneral-1.2.tar.gz) = 00bdf242c64c544511f359576f5bae799336f23b81849225ac29d7e61c687ce3 +SIZE (lgeneral-1.2.tar.gz) = 1727728 diff -urN /usr/ports/games/lgeneral/files/patch-cflags games/lgeneral/files/patch-cflags --- /usr/ports/games/lgeneral/files/patch-cflags 2003-08-27 22:41:38.000000000 +0900 +++ games/lgeneral/files/patch-cflags 1970-01-01 09:00:00.000000000 +0900 @@ -1,9 +0,0 @@ ---- src/Makefile.in Thu Aug 15 04:40:49 2002 -+++ src/Makefile.in Tue Aug 26 21:07:10 2003 -@@ -102,5 +102,5 @@ - campaign.o strat_map.o ai.o engine.o ai_group.o - lgeneral_DEPENDENCIES = --CFLAGS = @CFLAGS@ -+CFLAGS += @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) diff -urN /usr/ports/games/lgeneral/files/patch-configure games/lgeneral/files/patch-configure --- /usr/ports/games/lgeneral/files/patch-configure 2002-11-19 22:47:13.000000000 +0900 +++ games/lgeneral/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 @@ -1,88 +0,0 @@ ---- configure.orig Thu Aug 15 10:40:40 2002 -+++ configure Wed Aug 28 09:00:22 2002 -@@ -1091,49 +1091,49 @@ - { echo "configure: error: maths library is needed" 1>&2; exit 1; } - fi - --echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 --echo "configure:1096: checking for main in -ldl" >&5 --ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-ldl $LIBS" --cat > conftest.$ac_ext <&6 -+#echo "configure:1096: checking for main in -ldl" >&5 -+#ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` -+#if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+# echo $ac_n "(cached) $ac_c" 1>&6 -+#else -+# ac_save_LIBS="$LIBS" -+#LIBS="-ldl $LIBS" -+#cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+#int main() { -+#main() -+#; return 0; } -+#EOF -+#if { (eval echo configure:1111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+# rm -rf conftest* -+# eval "ac_cv_lib_$ac_lib_var=yes" -+#else -+# echo "configure: failed program was:" >&5 -+# cat conftest.$ac_ext >&5 -+# rm -rf conftest* -+# eval "ac_cv_lib_$ac_lib_var=no" -+#fi -+#rm -f conftest* -+#LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -- cat >> confdefs.h <&6 -+# ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+# -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+# cat >> confdefs.h <&6 --{ echo "configure: error: dl library is needed" 1>&2; exit 1; } --fi -+#else -+# echo "$ac_t""no" 1>&6 -+#{ echo "configure: error: dl library is needed" 1>&2; exit 1; } -+#fi - - - # Check whether --with-sdl-prefix or --without-sdl-prefix was given. diff -urN /usr/ports/games/lgeneral/pkg-plist games/lgeneral/pkg-plist --- /usr/ports/games/lgeneral/pkg-plist 2004-12-29 13:36:00.000000000 +0900 +++ games/lgeneral/pkg-plist 2010-10-15 04:02:10.000000000 +0900 @@ -1,61 +1,101 @@ +bin/lgc-pg +bin/lged bin/lgeneral -share/games/lgeneral/gfx/font_credit.bmp -share/games/lgeneral/gfx/title.bmp -share/games/lgeneral/themes/default/click.wav -share/games/lgeneral/themes/default/edit.wav -share/games/lgeneral/themes/default/bkgnd.bmp -share/games/lgeneral/themes/default/brief_frame.bmp -share/games/lgeneral/themes/default/confirm_buttons.bmp -share/games/lgeneral/themes/default/ctrl_buttons.bmp -share/games/lgeneral/themes/default/cursors.bmp -share/games/lgeneral/themes/default/deploy_buttons.bmp -share/games/lgeneral/themes/default/folder.bmp -share/games/lgeneral/themes/default/font_brief.bmp -share/games/lgeneral/themes/default/font_error.bmp -share/games/lgeneral/themes/default/font_status.bmp -share/games/lgeneral/themes/default/font_std.bmp -share/games/lgeneral/themes/default/font_turn_info.bmp -share/games/lgeneral/themes/default/fr_hori.bmp -share/games/lgeneral/themes/default/fr_llc.bmp -share/games/lgeneral/themes/default/fr_luc.bmp -share/games/lgeneral/themes/default/fr_rlc.bmp -share/games/lgeneral/themes/default/fr_ruc.bmp -share/games/lgeneral/themes/default/fr_vert.bmp -share/games/lgeneral/themes/default/menu0_buttons.bmp -share/games/lgeneral/themes/default/menu1_buttons.bmp -share/games/lgeneral/themes/default/menu2_buttons.bmp -share/games/lgeneral/themes/default/menu3_buttons.bmp -share/games/lgeneral/themes/default/menu4_buttons.bmp -share/games/lgeneral/themes/default/module_buttons.bmp -share/games/lgeneral/themes/default/scen_dlg_buttons.bmp -share/games/lgeneral/themes/default/scroll_buttons.bmp -share/games/lgeneral/themes/default/setup_confirm_buttons.bmp -share/games/lgeneral/themes/default/unit_buttons.bmp -share/games/lgeneral/themes/default/wallpaper.bmp -@dirrm share/games/lgeneral/gfx/terrain -@dirrm share/games/lgeneral/gfx/units -@dirrm share/games/lgeneral/gfx/flags -@dirrm share/games/lgeneral/themes/default -@dirrm share/games/lgeneral/campaigns -@dirrm share/games/lgeneral/maps -@dirrm share/games/lgeneral/nations -@dirrm share/games/lgeneral/sounds -@dirrm share/games/lgeneral/music -@dirrm share/games/lgeneral/units -@dirrm share/games/lgeneral/scenarios -@dirrm share/games/lgeneral/ai_modules -@dirrm share/games/lgeneral/gfx -@dirrm share/games/lgeneral/themes -@dirrm share/games/lgeneral -@dirrm share/games -@exec mkdir -p %D/share/games/lgeneral/gfx/units -@exec mkdir -p %D/share/games/lgeneral/gfx/terrain -@exec mkdir -p %D/share/games/lgeneral/gfx/flags -@exec mkdir -p %D/share/games/lgeneral/nations -@exec mkdir -p %D/share/games/lgeneral/units -@exec mkdir -p %D/share/games/lgeneral/sounds -@exec mkdir -p %D/share/games/lgeneral/maps -@exec mkdir -p %D/share/games/lgeneral/scenarios -@exec mkdir -p %D/share/games/lgeneral/campaigns -@exec mkdir -p %D/share/games/lgeneral/music -@exec mkdir -p %D/share/games/lgeneral/ai_modules +bin/ltrextract +bin/shptool +share/applications/lgeneral.desktop +%%PORTDOCS%%%%DOCSDIR%%/README.lgc-pg +%%PORTDOCS%%%%DOCSDIR%%/README.lgeneral +%%PORTDOCS%%%%DOCSDIR%%/README.redit +%%DATADIR%%/campaigns/PG +%%DATADIR%%/convdata/air.wav +%%DATADIR%%/convdata/air2.wav +%%DATADIR%%/convdata/attack.bmp +%%DATADIR%%/convdata/battle.wav +%%DATADIR%%/convdata/crosshair.bmp +%%DATADIR%%/convdata/damage_bars.bmp +%%DATADIR%%/convdata/danger.bmp +%%DATADIR%%/convdata/fog.bmp +%%DATADIR%%/convdata/grid.bmp +%%DATADIR%%/convdata/guard.bmp +%%DATADIR%%/convdata/leg.wav +%%DATADIR%%/convdata/mapnames +%%DATADIR%%/convdata/move.bmp +%%DATADIR%%/convdata/reinf +%%DATADIR%%/convdata/road2.bmp +%%DATADIR%%/convdata/sea.wav +%%DATADIR%%/convdata/select.wav +%%DATADIR%%/convdata/select_frame.bmp +%%DATADIR%%/convdata/strength.bmp +%%DATADIR%%/convdata/title.bmp +%%DATADIR%%/convdata/tracked.wav +%%DATADIR%%/convdata/wheeled.wav +%%DATADIR%%/gfx/font_credit.bmp +%%DATADIR%%/gfx/title.bmp +%%DATADIR%%/themes/default/bkgnd.bmp +%%DATADIR%%/themes/default/brief_frame.bmp +%%DATADIR%%/themes/default/click.wav +%%DATADIR%%/themes/default/confirm_buttons.bmp +%%DATADIR%%/themes/default/ctrl_buttons.bmp +%%DATADIR%%/themes/default/cursors.bmp +%%DATADIR%%/themes/default/deploy_buttons.bmp +%%DATADIR%%/themes/default/edit.wav +%%DATADIR%%/themes/default/folder.bmp +%%DATADIR%%/themes/default/font_brief.bmp +%%DATADIR%%/themes/default/font_error.bmp +%%DATADIR%%/themes/default/font_status.bmp +%%DATADIR%%/themes/default/font_std.bmp +%%DATADIR%%/themes/default/font_turn_info.bmp +%%DATADIR%%/themes/default/fr_hori.bmp +%%DATADIR%%/themes/default/fr_llc.bmp +%%DATADIR%%/themes/default/fr_luc.bmp +%%DATADIR%%/themes/default/fr_rlc.bmp +%%DATADIR%%/themes/default/fr_ruc.bmp +%%DATADIR%%/themes/default/fr_vert.bmp +%%DATADIR%%/themes/default/menu0_buttons.bmp +%%DATADIR%%/themes/default/menu1_buttons.bmp +%%DATADIR%%/themes/default/menu2_buttons.bmp +%%DATADIR%%/themes/default/menu3_buttons.bmp +%%DATADIR%%/themes/default/menu4_buttons.bmp +%%DATADIR%%/themes/default/module_buttons.bmp +%%DATADIR%%/themes/default/scen_dlg_buttons.bmp +%%DATADIR%%/themes/default/scroll_buttons.bmp +%%DATADIR%%/themes/default/setup_confirm_buttons.bmp +%%DATADIR%%/themes/default/strength_buttons.bmp +%%DATADIR%%/themes/default/unit_buttons.bmp +%%DATADIR%%/themes/default/wallpaper.bmp +%%NLS%%share/locale/de/LC_MESSAGES/lgeneral.mo +%%NLS%%share/locale/de/LC_MESSAGES/pg.mo +%%NLS%%share/locale/en/LC_MESSAGES/lgeneral.mo +%%NLS%%share/locale/en/LC_MESSAGES/pg.mo +share/pixmaps/lgeneral48.png +@dirrmtry %%DATADIR%%/units +@dirrmtry %%DATADIR%%/themes/default +@dirrmtry %%DATADIR%%/themes +@dirrmtry %%DATADIR%%/terrain +@dirrmtry %%DATADIR%%/sounds +@dirrmtry %%DATADIR%%/scenarios +@dirrmtry %%DATADIR%%/nations +@dirrmtry %%DATADIR%%/music +@dirrmtry %%DATADIR%%/maps +@dirrmtry %%DATADIR%%/gfx/units +@dirrmtry %%DATADIR%%/gfx/terrain +@dirrmtry %%DATADIR%%/gfx/flags +@dirrmtry %%DATADIR%%/gfx +@dirrmtry %%DATADIR%%/convdata +@dirrmtry %%DATADIR%%/campaigns +@dirrmtry %%DATADIR%%/ai_modules +@dirrmtry %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry share/applications +@exec mkdir -p %D/share/lgeneral/ai_modules +@exec mkdir -p %D/share/lgeneral/gfx/flags +@exec mkdir -p %D/share/lgeneral/gfx/terrain +@exec mkdir -p %D/share/lgeneral/gfx/units +@exec mkdir -p %D/share/lgeneral/maps +@exec mkdir -p %D/share/lgeneral/music +@exec mkdir -p %D/share/lgeneral/nations +@exec mkdir -p %D/share/lgeneral/scenarios +@exec mkdir -p %D/share/lgeneral/sounds +@exec mkdir -p %D/share/lgeneral/terrain +@exec mkdir -p %D/share/lgeneral/units