From b7bdcd418e7aca3dd98409e16a4c4ae9bc289d02 Mon Sep 17 00:00:00 2001 From: Jeremy Lea Date: Thu, 5 Oct 2000 07:10:50 +0000 Subject: Implement USE_GNOME, part 1. --- games/atomix/Makefile | 9 +-------- games/bombermaze/Makefile | 17 +++-------------- games/gcompris/Makefile | 24 +++++++++--------------- games/gcompris/pkg-plist | 26 +++++++++++++------------- games/gcompris2/Makefile | 24 +++++++++--------------- games/gcompris2/pkg-plist | 26 +++++++++++++------------- games/gno3dtet/Makefile | 21 +++++++++++++-------- games/gno3dtet/pkg-plist | 32 ++++++++++++++++---------------- games/gnocatan/Makefile | 10 +--------- games/gnome-games/Makefile | 10 ++-------- games/gnomechess/Makefile | 14 +++----------- games/gnomegames/Makefile | 10 ++-------- games/gnomegames2/Makefile | 10 ++-------- games/gnomememoryblocks/Makefile | 13 +------------ games/gtetrinet/Makefile | 10 ++++++---- games/gtetrinet/pkg-plist | 12 ++++++------ games/gtktetcolor/Makefile | 16 +++------------- games/pioneers/Makefile | 10 +--------- games/pythoong/Makefile | 19 ++++++------------- 19 files changed, 110 insertions(+), 203 deletions(-) (limited to 'games') diff --git a/games/atomix/Makefile b/games/atomix/Makefile index 4cf79921416b..4466990e6d2a 100644 --- a/games/atomix/Makefile +++ b/games/atomix/Makefile @@ -13,17 +13,10 @@ DISTNAME= atomix-0.2.0-1 MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - xml.5:${PORTSDIR}/textproc/libxml - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile index 96210876bd67..ecbb88126bd0 100644 --- a/games/bombermaze/Makefile +++ b/games/bombermaze/Makefile @@ -13,26 +13,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -fpermissive -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 370ee96880db..a6d5bbb2fdfb 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -15,29 +15,23 @@ EXTRACT_SUFX= .tgz MAINTAINER= sobomax@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" post-extract: @${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh @${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \ - s|\$\(datadir\)/sounds|\$\(datadir\)/gnome/sounds|g ; \ - s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g' + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' .include diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist index e9a93f247271..de80d4173a65 100644 --- a/games/gcompris/pkg-plist +++ b/games/gcompris/pkg-plist @@ -1,16 +1,16 @@ bin/gcompris etc/sound/events/gcompris.soundlist -share/gcompris/data/wordsgame/wordslevel1.en -share/gcompris/data/wordsgame/wordslevel1.es -share/gcompris/data/wordsgame/wordslevel1.fr -share/gcompris/data/wordsgame/wordslevel2.en -share/gcompris/data/wordsgame/wordslevel2.es -share/gcompris/data/wordsgame/wordslevel2.fr -share/gcompris/data/wordsgame/wordslevelmax.en -share/gcompris/data/wordsgame/wordslevelmax.es -share/gcompris/data/wordsgame/wordslevelmax.fr -share/gcompris/data/wordsgame/wordslevelmax.nl share/gnome/apps/Games/gcompris.desktop +share/gnome/gcompris/data/wordsgame/wordslevel1.en +share/gnome/gcompris/data/wordsgame/wordslevel1.es +share/gnome/gcompris/data/wordsgame/wordslevel1.fr +share/gnome/gcompris/data/wordsgame/wordslevel2.en +share/gnome/gcompris/data/wordsgame/wordslevel2.es +share/gnome/gcompris/data/wordsgame/wordslevel2.fr +share/gnome/gcompris/data/wordsgame/wordslevelmax.en +share/gnome/gcompris/data/wordsgame/wordslevelmax.es +share/gnome/gcompris/data/wordsgame/wordslevelmax.fr +share/gnome/gcompris/data/wordsgame/wordslevelmax.nl share/gnome/pixmaps/gcompris/animals/baby-elephant.png share/gnome/pixmaps/gcompris/animals/baby-gorilla.png share/gnome/pixmaps/gcompris/animals/bat.png @@ -156,6 +156,6 @@ share/locale/nl/LC_MESSAGES/gcompris.mo @dirrm share/gnome/pixmaps/gcompris/buttons @dirrm share/gnome/pixmaps/gcompris/animals @dirrm share/gnome/pixmaps/gcompris -@dirrm share/gcompris/data/wordsgame -@dirrm share/gcompris/data -@dirrm share/gcompris +@dirrm share/gnome/gcompris/data/wordsgame +@dirrm share/gnome/gcompris/data +@dirrm share/gnome/gcompris diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index 370ee96880db..a6d5bbb2fdfb 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -15,29 +15,23 @@ EXTRACT_SUFX= .tgz MAINTAINER= sobomax@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" post-extract: @${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh @${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \ - s|\$\(datadir\)/sounds|\$\(datadir\)/gnome/sounds|g ; \ - s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g' + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' .include diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist index e9a93f247271..de80d4173a65 100644 --- a/games/gcompris2/pkg-plist +++ b/games/gcompris2/pkg-plist @@ -1,16 +1,16 @@ bin/gcompris etc/sound/events/gcompris.soundlist -share/gcompris/data/wordsgame/wordslevel1.en -share/gcompris/data/wordsgame/wordslevel1.es -share/gcompris/data/wordsgame/wordslevel1.fr -share/gcompris/data/wordsgame/wordslevel2.en -share/gcompris/data/wordsgame/wordslevel2.es -share/gcompris/data/wordsgame/wordslevel2.fr -share/gcompris/data/wordsgame/wordslevelmax.en -share/gcompris/data/wordsgame/wordslevelmax.es -share/gcompris/data/wordsgame/wordslevelmax.fr -share/gcompris/data/wordsgame/wordslevelmax.nl share/gnome/apps/Games/gcompris.desktop +share/gnome/gcompris/data/wordsgame/wordslevel1.en +share/gnome/gcompris/data/wordsgame/wordslevel1.es +share/gnome/gcompris/data/wordsgame/wordslevel1.fr +share/gnome/gcompris/data/wordsgame/wordslevel2.en +share/gnome/gcompris/data/wordsgame/wordslevel2.es +share/gnome/gcompris/data/wordsgame/wordslevel2.fr +share/gnome/gcompris/data/wordsgame/wordslevelmax.en +share/gnome/gcompris/data/wordsgame/wordslevelmax.es +share/gnome/gcompris/data/wordsgame/wordslevelmax.fr +share/gnome/gcompris/data/wordsgame/wordslevelmax.nl share/gnome/pixmaps/gcompris/animals/baby-elephant.png share/gnome/pixmaps/gcompris/animals/baby-gorilla.png share/gnome/pixmaps/gcompris/animals/bat.png @@ -156,6 +156,6 @@ share/locale/nl/LC_MESSAGES/gcompris.mo @dirrm share/gnome/pixmaps/gcompris/buttons @dirrm share/gnome/pixmaps/gcompris/animals @dirrm share/gnome/pixmaps/gcompris -@dirrm share/gcompris/data/wordsgame -@dirrm share/gcompris/data -@dirrm share/gcompris +@dirrm share/gnome/gcompris/data/wordsgame +@dirrm share/gnome/gcompris/data +@dirrm share/gnome/gcompris diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile index 7a72dc3ac81d..a40d496f624a 100644 --- a/games/gno3dtet/Makefile +++ b/games/gno3dtet/Makefile @@ -13,14 +13,19 @@ EXTRACT_SUFX= .tgz MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GNOME_CONFIG?= ${X11BASE}/bin/gnome-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GNU_CONFIGURE= yes -CONFIGURE_ENV= GNOME_CONFIG=${GNOME_CONFIG} GTK_CONFIG=${GTK_CONFIG} USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +pre-patch: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ + s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' pre-configure: @${RM} -f ${WRKSRC}/config.cache @@ -28,7 +33,7 @@ pre-configure: post-install: ${CHOWN} root:games ${PREFIX}/bin/gno3dtet ${CHMOD} 2555 ${PREFIX}/bin/gno3dtet - ${CHOWN} root:games ${PREFIX}/var/games/gno3dtet.hof - ${CHMOD} 664 ${PREFIX}/var/games/gno3dtet.hof + ${CHOWN} root:games ${PREFIX}/share/gnome/games/gno3dtet.hof + ${CHMOD} 664 ${PREFIX}/share/gnome/games/gno3dtet.hof .include diff --git a/games/gno3dtet/pkg-plist b/games/gno3dtet/pkg-plist index a4e088a973ad..0694b7bb88dc 100644 --- a/games/gno3dtet/pkg-plist +++ b/games/gno3dtet/pkg-plist @@ -1,21 +1,21 @@ bin/gno3dtet share/gnome/apps/Games/gno3dtet.desktop -share/gnome/help/gno3dtet/C/topic.dat -share/gnome/help/gno3dtet/C/gno3dtet.html +share/gnome/games/gno3dtet.hof share/gnome/help/gno3dtet/C/copying.html -share/pixmaps/gno3dtet.png -var/games/gno3dtet.hof -share/sounds/gno3dtet/danger.wav -share/sounds/gno3dtet/fall.wav -share/sounds/gno3dtet/hof.wav -share/sounds/gno3dtet/land.wav -share/sounds/gno3dtet/layer.wav -share/sounds/gno3dtet/level.wav -share/sounds/gno3dtet/move.wav -share/sounds/gno3dtet/new.wav -share/sounds/gno3dtet/pause.wav -share/sounds/gno3dtet/score.wav -share/sounds/gno3dtet/screwd.wav +share/gnome/help/gno3dtet/C/gno3dtet.html +share/gnome/help/gno3dtet/C/topic.dat +share/gnome/pixmaps/gno3dtet.png +share/gnome/sounds/gno3dtet/danger.wav +share/gnome/sounds/gno3dtet/fall.wav +share/gnome/sounds/gno3dtet/hof.wav +share/gnome/sounds/gno3dtet/land.wav +share/gnome/sounds/gno3dtet/layer.wav +share/gnome/sounds/gno3dtet/level.wav +share/gnome/sounds/gno3dtet/move.wav +share/gnome/sounds/gno3dtet/new.wav +share/gnome/sounds/gno3dtet/pause.wav +share/gnome/sounds/gno3dtet/score.wav +share/gnome/sounds/gno3dtet/screwd.wav +@dirrm share/gnome/sounds/gno3dtet @dirrm share/gnome/help/gno3dtet/C @dirrm share/gnome/help/gno3dtet -@dirrm share/sounds/gno3dtet diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index c71e51672f19..60a0982878cd 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -13,19 +13,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 4ff817e59c07..83b8044bef9c 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -14,20 +14,14 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - guile.9:${PORTSDIR}/lang/guile -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile index 6d7c82228e83..1bf721b63f69 100644 --- a/games/gnomechess/Makefile +++ b/games/gnomechess/Makefile @@ -14,22 +14,14 @@ DISTNAME= gnome-chess-${PORTVERSION} MAINTAINER= reg@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - crafty:${PORTSDIR}/games/crafty -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - crafty:${PORTSDIR}/games/crafty - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty +RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" .include diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index 4ff817e59c07..83b8044bef9c 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -14,20 +14,14 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - guile.9:${PORTSDIR}/lang/guile -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 4ff817e59c07..83b8044bef9c 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -14,20 +14,14 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - guile.9:${PORTSDIR}/lang/guile -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile index f7e8ba9bdbe0..e64e95038c57 100644 --- a/games/gnomememoryblocks/Makefile +++ b/games/gnomememoryblocks/Makefile @@ -14,21 +14,10 @@ DISTNAME= gnome-memblocks-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes +USE_GNOME= yes USE_LIBTOOL= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile index 10108f951eea..5dccc8912ed5 100644 --- a/games/gtetrinet/Makefile +++ b/games/gtetrinet/Makefile @@ -12,11 +12,13 @@ MASTER_SITE_SUBDIR= gtetrinet MAINTAINER= bugg@bugg.strangled.net -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs - -GTK_CONFIG= "${X11BASE}/bin/gtk12-config" +USE_X_PREFIX= yes USE_GMAKE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GNOME= yes GNU_CONFIGURE= yes +pre-patch: + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' + .include diff --git a/games/gtetrinet/pkg-plist b/games/gtetrinet/pkg-plist index ecafe1e1e841..422a50138895 100644 --- a/games/gtetrinet/pkg-plist +++ b/games/gtetrinet/pkg-plist @@ -1,8 +1,8 @@ bin/gtetrinet -share/gtetrinet/themes/default/blocks.png -share/gtetrinet/themes/default/theme.cfg -share/pixmaps/gtetrinet.png +share/gnome/gtetrinet/themes/default/blocks.png +share/gnome/gtetrinet/themes/default/theme.cfg +share/gnome/pixmaps/gtetrinet.png share/gnome/apps/Games/gtetrinet.desktop -@dirrm share/gtetrinet/themes/default -@dirrm share/gtetrinet/themes -@dirrm share/gtetrinet +@dirrm share/gnome/gtetrinet/themes/default +@dirrm share/gnome/gtetrinet/themes +@dirrm share/gnome/gtetrinet diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile index 7fc47792dbbb..f21b02e40ebc 100644 --- a/games/gtktetcolor/Makefile +++ b/games/gtktetcolor/Makefile @@ -13,21 +13,11 @@ MASTER_SITES= http://www.dvgu.ru/ifit/~panov/gtktetcolor/ \ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore - USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile index c71e51672f19..60a0982878cd 100644 --- a/games/pioneers/Makefile +++ b/games/pioneers/Makefile @@ -13,19 +13,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore - -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" pre-patch: diff --git a/games/pythoong/Makefile b/games/pythoong/Makefile index bc4b6086ab90..97488dbad7a8 100644 --- a/games/pythoong/Makefile +++ b/games/pythoong/Makefile @@ -13,28 +13,21 @@ MASTER_SITES= http://perso.wanadoo.fr/christophe.cressend/tarballs/ MAINTAINER= sobomax@FreeBSD.org BUILD_DEPENDS= xbmtopbm:${PORTSDIR}/graphics/netpbm -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_GNOME= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - -CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ - GTK_CONFIG="${GTK_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -post-extract: +pre-patch: @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g ; \ - s|\$\(localstatedir\)/games|\$\(datadir\)/gnome/games|g' + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include -- cgit v1.2.3