Hello all.
Second bunch of fixes for problems found with portcheck(1).
More to come.
For games/heroes, this removes "ggi" FLAVOR, because we have
graphics/ggi removed a long ago.
okay?
--
WBR,
Vadim Zhukov
Index: editors/emacs/Makefile
===================================================================
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- editors/emacs/Makefile 4 Jun 2013 18:41:41 -0000 1.38
+++ editors/emacs/Makefile 18 Aug 2013 21:32:28 -0000
@@ -6,6 +6,7 @@ COMMENT= GNU editor: extensible, custom
VERSION= 24.3
DISTNAME= emacs-${VERSION}
+REVISION= 0
CATEGORIES= editors
@@ -42,6 +43,7 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
SUBST_VARS= GCCARCH VERSION
MODULES= devel/gettext
+RUN_DEPENDS= devel/desktop-file-utils x11/gtk+2,-guic
LIB_DEPENDS= devel/libexecinfo security/gnutls textproc/libxml
.if ${FLAVOR} == "no_x11"
Index: editors/emacs/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- editors/emacs/pkg/PLIST 7 May 2013 07:06:42 -0000 1.12
+++ editors/emacs/pkg/PLIST 18 Aug 2013 21:32:28 -0000
@@ -4005,3 +4005,7 @@ share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/emacs.svg
share/icons/hicolor/scalable/mimetypes/
share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: editors/libreoffice/Makefile
===================================================================
RCS file: /cvs/ports/editors/libreoffice/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- editors/libreoffice/Makefile 21 Jun 2013 06:07:58 -0000 1.90
+++ editors/libreoffice/Makefile 18 Aug 2013 21:31:06 -0000
@@ -17,6 +17,7 @@ PKGNAME-java= libreoffice-java-${VERSION
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel
+REVISION-main= 0
EPOCH= 0
MAINTAINER= Robert Nagy <rob...@openbsd.org>
Index: editors/libreoffice/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/editors/libreoffice/pkg/PLIST-main,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST-main
--- editors/libreoffice/pkg/PLIST-main 21 Jun 2013 06:07:58 -0000 1.29
+++ editors/libreoffice/pkg/PLIST-main 18 Aug 2013 21:31:06 -0000
@@ -3134,12 +3134,6 @@ lib/libreoffice/ure/
lib/libreoffice/ure-link
lib/libreoffice/ure/bin/
lib/libreoffice/ure/bin/regcomp
-@exec %D/bin/update-mime-database %D/share/mime
-@unexec-delete %D/bin/update-mime-database %D/share/mime
-@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
@bin lib/libreoffice/ure/bin/regcomp.bin
@bin lib/libreoffice/ure/bin/regmerge
@bin lib/libreoffice/ure/bin/regview
Index: games/angband/Makefile
===================================================================
RCS file: /cvs/ports/games/angband/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- games/angband/Makefile 11 Mar 2013 11:07:37 -0000 1.27
+++ games/angband/Makefile 18 Aug 2013 21:36:30 -0000
@@ -9,6 +9,7 @@ V_DLDIR = ${V:C/\.[0-9]$//}
DISTNAME= angband-v${V}
PKGNAME= angband-${V}
CATEGORIES= games
+REVISION= 0
HOMEPAGE= http://rephial.org
@@ -36,6 +37,8 @@ USE_GMAKE = Yes
FLAVORS= no_x11 sdl
FLAVOR?=
+RUN_DEPENDS = devel/desktop-file-utils
+
.if ${FLAVOR:Mno_x11}
CONFIGURE_ARGS+= --without-x
.else
@@ -50,7 +53,6 @@ PKG_ARGS += -Dsdl=1
LIB_DEPENDS += devel/sdl-mixer \
devel/sdl-image \
devel/sdl-ttf
-RUN_DEPENDS += devel/desktop-file-utils
WANTLIB += SDL SDL_image SDL_mixer SDL_ttf pthread
.else
CONFIGURE_ARGS += --disable-sdl-mixer # defaults to ON
Index: games/dopewars/Makefile
===================================================================
RCS file: /cvs/ports/games/dopewars/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- games/dopewars/Makefile 21 Mar 2013 08:45:17 -0000 1.58
+++ games/dopewars/Makefile 18 Aug 2013 21:39:55 -0000
@@ -3,7 +3,7 @@
COMMENT= game where you deal drugs on the streets of NY
DISTNAME= dopewars-1.5.12
-REVISION= 9
+REVISION= 10
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dopewars/}
@@ -17,7 +17,6 @@ WANTLIB += c glib-2.0 ncurses
MODULES+= devel/gettext
LIB_DEPENDS+= devel/glib2
-RUN_DEPENDS+= devel/desktop-file-utils
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games
Index: games/dopewars/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/dopewars/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- games/dopewars/pkg/PLIST 23 Dec 2012 14:23:13 -0000 1.18
+++ games/dopewars/pkg/PLIST 18 Aug 2013 21:39:55 -0000
@@ -70,5 +70,3 @@ share/pixmaps/
share/pixmaps/dopewars-pill.png
share/pixmaps/dopewars-shot.png
share/pixmaps/dopewars-weed.png
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
Index: games/freeciv/Makefile
===================================================================
RCS file: /cvs/ports/games/freeciv/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- games/freeciv/Makefile 31 May 2013 15:34:45 -0000 1.95
+++ games/freeciv/Makefile 18 Aug 2013 21:42:58 -0000
@@ -12,7 +12,7 @@ PKGNAME-share= freeciv-share-${VERSION}
CATEGORIES= games
HOMEPAGE= http://www.freeciv.org/
-REVISION-main= 0
+REVISION-main= 1
REVISION-client=0
# GPLv2+
@@ -67,7 +67,9 @@ RUN_DEPENDS-client= devel/desktop-file-u
freeciv-share-${VERSION}:${BUILD_PKGPATH},-share \
x11/gtk+2,-guic
-RUN_DEPENDS-main= freeciv-share-${VERSION}:${BUILD_PKGPATH},-share
+RUN_DEPENDS-main= freeciv-share-${VERSION}:${BUILD_PKGPATH},-share \
+ devel/desktop-file-utils \
+ x11/gtk+2,-guic
USE_GMAKE= Yes
USE_LIBTOOL = No
Index: games/freeciv/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/games/freeciv/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- games/freeciv/pkg/PLIST-main 7 Jan 2013 07:06:58 -0000 1.4
+++ games/freeciv/pkg/PLIST-main 18 Aug 2013 21:42:58 -0000
@@ -28,8 +28,8 @@ share/locale/ga/LC_MESSAGES/freeciv.mo
share/locale/gd/
share/locale/gd/LC_MESSAGES/
share/locale/gd/LC_MESSAGES/freeciv.mo
+share/locale/sr/LC_MESSAGES/freeciv.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
-share/locale/sr/LC_MESSAGES/freeciv.mo
Index: games/gottcode/connectagram/Makefile
===================================================================
RCS file: /cvs/ports/games/gottcode/connectagram/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- games/gottcode/connectagram/Makefile 26 Jun 2013 18:58:38 -0000
1.1.1.1
+++ games/gottcode/connectagram/Makefile 18 Aug 2013 21:45:24 -0000
@@ -3,5 +3,6 @@
GAME = connectagram
COMMENT = word unscrambling game
DISTNAME = ${GAME}-1.1.1-src
+REVISION = 0
.include <bsd.port.mk>
Index: games/gottcode/connectagram/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/gottcode/connectagram/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- games/gottcode/connectagram/pkg/PLIST 26 Jun 2013 18:58:38 -0000
1.1.1.1
+++ games/gottcode/connectagram/pkg/PLIST 18 Aug 2013 21:45:24 -0000
@@ -24,7 +24,6 @@ share/icons/hicolor/256x256/apps/connect
share/icons/hicolor/32x32/apps/connectagram.png
share/icons/hicolor/48x48/apps/connectagram.png
share/icons/hicolor/64x64/apps/connectagram.png
-@unexec-delete %D/bin/update-desktop-database
share/icons/hicolor/scalable/apps/connectagram.svg
share/pixmaps/
share/pixmaps/connectagram.xpm
Index: games/heroes/Makefile
===================================================================
RCS file: /cvs/ports/games/heroes/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- games/heroes/Makefile 11 Mar 2013 11:07:39 -0000 1.25
+++ games/heroes/Makefile 18 Aug 2013 21:57:26 -0000
@@ -7,7 +7,7 @@ DATAVERSION= 1.5
SOUNDVERSION= 1.0
MUSICVERSION= 1.0
DISTNAME= heroes-${VERSION}
-REVISION = 2
+REVISION = 3
CATEGORIES= games x11
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -21,7 +21,7 @@ HOMEPAGE= http://heroes.sourceforge.net/
MAINTAINER= Peter Valchev <pvalc...@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c m
+WANTLIB= SDL SDL_mixer c m pthread
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=heroes/}
@@ -30,39 +30,14 @@ USE_GROFF = Yes
MODULES= devel/gettext
-FLAVORS= sdl ggi
-FLAVOR?= sdl
-
-.if empty(FLAVOR:Msdl) && empty(FLAVOR:Mggi)
-ERRORS+= "Fatal: Must choose one flavor: sdl or ggi"
-.endif
-
-.if ${FLAVOR:Msdl} && ${FLAVOR:Mggi}
-ERRORS+= "Fatal: Choose only one flavor: sdl or ggi"
-.endif
-
-.if ${FLAVOR:Msdl}
-LIB_DEPENDS += devel/sdl \
+LIB_DEPENDS= devel/sdl \
devel/sdl-mixer
-WANTLIB += SDL SDL_mixer
-CONFIGURE_ARGS+= --with-sdl="${LOCALBASE}"
-WANTLIB += X11 Xext pthread pthread-stubs usbhid xcb
-.else
-CONFIGURE_ARGS+= --without-sdl --without-sdl-mixer
-WANTLIB += gii
-.endif
-
-.if ${FLAVOR:Mggi}
-# Sound support is disabled with the ggi flavor since it is dependent
-# on sdl-mixer. No alternatives for now.
-LIB_DEPENDS += graphics/ggi
-WANTLIB += ggi>=2.0
-CONFIGURE_ARGS += --with-ggi="${LOCALBASE}"
-FULLPKGNAME = heroes-${VERSION}
-.else
-CONFIGURE_ARGS += --without-ggi
-.endif
+CONFIGURE_ARGS= --disable-debug \
+ --disable-optimizations \
+ --with-sdl="${LOCALBASE}" \
+ --without-ggi \
+ --without-mikmod
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
@@ -70,9 +45,6 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/tool
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lm -lintl -liconv" \
ac_cv_header_io_h=no
-CONFIGURE_ARGS+= --disable-optimizations \
- --disable-debug \
- --without-mikmod
post-install:
.for dir in levels pics tilesets
Index: games/heroes/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/heroes/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- games/heroes/pkg/PLIST 15 Sep 2004 00:46:09 -0000 1.7
+++ games/heroes/pkg/PLIST 18 Aug 2013 21:57:26 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2004/09/15 00:46:09 espie Exp $
+@pkgpath games/heroes,-ggi
+@pkgpath games/heroes,-sdl
bin/heroes
bin/heroeslvl
@info info/heroes.info
Index: games/redeclipse/Makefile
===================================================================
RCS file: /cvs/ports/games/redeclipse/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- games/redeclipse/Makefile 29 Apr 2013 01:50:53 -0000 1.1.1.1
+++ games/redeclipse/Makefile 18 Aug 2013 21:54:12 -0000
@@ -14,7 +14,7 @@ MULTI_PACKAGES= -main -data
N= redeclipse
V= 1.4
-REVISION= 1
+REVISION= 2
PKGNAME= ${N}-${V}
PKGNAME-main= ${N}-${V}
PKGNAME-data= ${N}-data-${V}
Index: games/redeclipse/pkg/PLIST-data
===================================================================
RCS file: /cvs/ports/games/redeclipse/pkg/PLIST-data,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-data
--- games/redeclipse/pkg/PLIST-data 29 Apr 2013 01:50:57 -0000 1.1.1.1
+++ games/redeclipse/pkg/PLIST-data 18 Aug 2013 21:54:12 -0000
@@ -1,17 +1,4 @@
@comment $OpenBSD: PLIST-data,v 1.1.1.1 2013/04/29 01:50:57 jsg Exp $
-share/applications/
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
share/redeclipse/
share/redeclipse/data/
share/redeclipse/data/appleflap/
Index: games/redeclipse/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/games/redeclipse/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- games/redeclipse/pkg/PLIST-main 29 Apr 2013 01:50:57 -0000 1.1.1.1
+++ games/redeclipse/pkg/PLIST-main 18 Aug 2013 21:54:12 -0000
@@ -8,15 +8,28 @@ lib/redeclipse/game
@bin lib/redeclipse/redeclipse-server
@man man/man6/redeclipse-server.6
@man man/man6/redeclipse.6
+share/applications/
share/applications/redeclipse.desktop
share/doc/redeclipse/
share/doc/redeclipse/guidelines.txt
share/examples/redeclipse/
share/examples/redeclipse/servinit.cfg
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/redeclipse.png
+share/icons/hicolor/16x16/
+share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/redeclipse.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/redeclipse.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/redeclipse.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/redeclipse.png
share/pixmaps/
share/pixmaps/redeclipse.xpm
Index: games/taxipilot/Makefile
===================================================================
RCS file: /cvs/ports/games/taxipilot/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- games/taxipilot/Makefile 27 Jun 2013 11:59:02 -0000 1.26
+++ games/taxipilot/Makefile 18 Aug 2013 22:00:25 -0000
@@ -3,7 +3,7 @@
COMMENT= silly little game based on Spacetaxi for the C64
DISTNAME= taxipilot-0.7.2
-REVISION = 6
+REVISION = 7
CATEGORIES= games
HOMEPAGE= http://taxipilot.sourceforge.net/
@@ -23,6 +23,7 @@ WANTLIB += lib/kde3/kwalletclient
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=taxipilot/}
+RUN_DEPENDS= x11/gtk+2,-guic
LIB_DEPENDS= x11/kde/libs3
MODULES= x11/qt3 devel/gettext
