diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-08-06 19:06:30 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-08-06 19:06:30 +0000 |
| commit | c0633510da317c661ae44bc821eb97649ae74106 (patch) | |
| tree | 7ef93f9f261eb1db468322db19874df79369ff2e | |
| parent | 19efd8ae750737b6ea17c74e1c680e35597d984a (diff) | |
| download | ports-c0633510da317c661ae44bc821eb97649ae74106.tar.gz ports-c0633510da317c661ae44bc821eb97649ae74106.zip | |
Notes
29 files changed, 110 insertions, 325 deletions
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile index 0505ea17116f..d8280e1edbc5 100644 --- a/devel/gnome-build/Makefile +++ b/devel/gnome-build/Makefile @@ -18,17 +18,15 @@ LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomevfs bonobo libglade gal gtkhtml +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/devel/gnome-build/files/patch-ltmain.sh b/devel/gnome-build/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/devel/gnome-build/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile index 5e4dbd586990..636758d701f9 100644 --- a/devel/gnome-crash/Makefile +++ b/devel/gnome-crash/Makefile @@ -16,16 +16,14 @@ MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack libglade gnomeprint USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile index 0505ea17116f..d8280e1edbc5 100644 --- a/devel/gnomebuild/Makefile +++ b/devel/gnomebuild/Makefile @@ -18,17 +18,15 @@ LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomevfs bonobo libglade gal gtkhtml +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/devel/gnomebuild/files/patch-ltmain.sh b/devel/gnomebuild/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/devel/gnomebuild/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile index 5e4dbd586990..636758d701f9 100644 --- a/devel/gnomecrash/Makefile +++ b/devel/gnomecrash/Makefile @@ -16,16 +16,14 @@ MAINTAINER= gnome@FreeBSD.org USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack libglade gnomeprint USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile index 812a37994cec..0486d94959a2 100644 --- a/devel/gnomedebug/Makefile +++ b/devel/gnomedebug/Makefile @@ -18,17 +18,15 @@ LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack bonobo gnomevfs libglade gal +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/devel/gnomedebug/files/patch-ltmain.sh b/devel/gnomedebug/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/devel/gnomedebug/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 1feb76fecf54..bf2e734ab786 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -19,17 +19,15 @@ RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/games/gcompris/files/patch-ac b/games/gcompris/files/patch-ac index dbecd07d983b..bfa9668b8c08 100644 --- a/games/gcompris/files/patch-ac +++ b/games/gcompris/files/patch-ac @@ -1,9 +1,9 @@ $FreeBSD$ ---- Makefile.in.orig Thu Apr 18 14:49:06 2002 -+++ Makefile.in Thu Apr 18 14:51:49 2002 -@@ -212,9 +212,9 @@ +--- Makefile.in.orig Sun Aug 4 23:01:03 2002 ++++ Makefile.in Sun Aug 4 23:22:07 2002 +@@ -219,9 +219,9 @@ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi @@ -16,7 +16,7 @@ $FreeBSD$ mostlyclean-hdr: -@@ -446,7 +446,7 @@ +@@ -453,7 +453,7 @@ install-exec-am: install-exec: install-exec-recursive @@ -25,19 +25,19 @@ $FreeBSD$ install-data-local install-data: install-data-recursive -@@ -519,13 +519,13 @@ +@@ -526,13 +526,13 @@ @$(NORMAL_INSTALL) if test -d @PACKAGE_DATA_DIR@; then \ $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \ - cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ -+ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ ++ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*.bak" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ fi dist-hook: if test -d @PACKAGE_DATA_DIR@; then \ $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \ - cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ -+ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ ++ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.bak" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ fi clean-local: diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist index bca543125cca..d63f88755160 100644 --- a/games/gcompris/pkg-plist +++ b/games/gcompris/pkg-plist @@ -28,14 +28,10 @@ lib/gcompris/libwordsgame.so share/gnome/apps/Games/gcompris.desktop share/gnome/gcompris/boards/Makefile share/gnome/gcompris/boards/Makefile.am -share/gnome/gcompris/boards/Makefile.in share/gnome/gcompris/boards/README share/gnome/gcompris/boards/algebra_by.xml -share/gnome/gcompris/boards/algebra_by.xml.in share/gnome/gcompris/boards/algebra_div.xml -share/gnome/gcompris/boards/algebra_div.xml.in share/gnome/gcompris/boards/algebra_guesscount.xml -share/gnome/gcompris/boards/algebra_guesscount.xml.in share/gnome/gcompris/boards/algebra_guesscount/+.png share/gnome/gcompris/boards/algebra_guesscount/-.png share/gnome/gcompris/boards/algebra_guesscount/1.png @@ -57,13 +53,9 @@ share/gnome/gcompris/boards/algebra_guesscount/algebra_guesscount-bg.jpg share/gnome/gcompris/boards/algebra_guesscount/button.png share/gnome/gcompris/boards/algebra_guesscount/x.png share/gnome/gcompris/boards/algebra_minus.xml -share/gnome/gcompris/boards/algebra_minus.xml.in share/gnome/gcompris/boards/algebra_plus.xml -share/gnome/gcompris/boards/algebra_plus.xml.in share/gnome/gcompris/boards/algebramenu.xml -share/gnome/gcompris/boards/algebramenu.xml.in share/gnome/gcompris/boards/babymatch.xml -share/gnome/gcompris/boards/babymatch.xml.in share/gnome/gcompris/boards/babymatch/Makefile share/gnome/gcompris/boards/babymatch/Makefile.am share/gnome/gcompris/boards/babymatch/board1_0.xml @@ -73,7 +65,6 @@ share/gnome/gcompris/boards/babymatch/board4_0.xml share/gnome/gcompris/boards/babymatch/board5_0.xml share/gnome/gcompris/boards/babymatch/board6_0.xml share/gnome/gcompris/boards/babyshapes.xml -share/gnome/gcompris/boards/babyshapes.xml.in share/gnome/gcompris/boards/babyshapes/T_banana.png share/gnome/gcompris/boards/babyshapes/T_circle.png share/gnome/gcompris/boards/babyshapes/T_colonne.png @@ -166,24 +157,17 @@ share/gnome/gcompris/boards/boardicons/target.png share/gnome/gcompris/boards/boardicons/tuxpara.png share/gnome/gcompris/boards/boardicons/wordsgame.png share/gnome/gcompris/boards/canal_lock.xml -share/gnome/gcompris/boards/canal_lock.xml.in share/gnome/gcompris/boards/canal_lock/canal_lock_bg.png share/gnome/gcompris/boards/click_on_letter.xml -share/gnome/gcompris/boards/click_on_letter.xml.in share/gnome/gcompris/boards/clickgame.xml -share/gnome/gcompris/boards/clickgame.xml.in share/gnome/gcompris/boards/clockgame.xml -share/gnome/gcompris/boards/clockgame.xml.in share/gnome/gcompris/boards/clockgame/clockgame-bg.jpg share/gnome/gcompris/boards/colors.xml -share/gnome/gcompris/boards/colors.xml.in share/gnome/gcompris/boards/colors/colors_bg.jpg share/gnome/gcompris/boards/colors/colors_highlight.png share/gnome/gcompris/boards/computer.xml -share/gnome/gcompris/boards/computer.xml.in share/gnome/gcompris/boards/dataset/mrpatate.xml share/gnome/gcompris/boards/doubleentry.xml -share/gnome/gcompris/boards/doubleentry.xml.in share/gnome/gcompris/boards/doubleentry/Makefile share/gnome/gcompris/boards/doubleentry/Makefile.am share/gnome/gcompris/boards/doubleentry/board1_0.xml @@ -216,7 +200,6 @@ share/gnome/gcompris/boards/doubleentry/circle-red-2.png share/gnome/gcompris/boards/doubleentry/circle-red-3.png share/gnome/gcompris/boards/doubleentry/gcompris-bg.png share/gnome/gcompris/boards/draw.xml -share/gnome/gcompris/boards/draw.xml.in share/gnome/gcompris/boards/draw/color-selector.jpg share/gnome/gcompris/boards/draw/draw-bg.jpg share/gnome/gcompris/boards/draw/tool-circle.png @@ -247,7 +230,6 @@ share/gnome/gcompris/boards/draw/tool-select.png share/gnome/gcompris/boards/draw/tool-select_on.png share/gnome/gcompris/boards/draw/tool-selector.jpg share/gnome/gcompris/boards/erase.xml -share/gnome/gcompris/boards/erase.xml.in share/gnome/gcompris/boards/fishes/QueenAngel_0.png share/gnome/gcompris/boards/fishes/QueenAngel_1.png share/gnome/gcompris/boards/fishes/blueking2_0.png @@ -356,7 +338,6 @@ share/gnome/gcompris/boards/flags/tr.png share/gnome/gcompris/boards/flags/uy.png share/gnome/gcompris/boards/flags/yu.png share/gnome/gcompris/boards/fun.xml -share/gnome/gcompris/boards/fun.xml.in share/gnome/gcompris/boards/gcompris/README share/gnome/gcompris/boards/gcompris/animals/bear001.jpg share/gnome/gcompris/boards/gcompris/animals/joybear001.jpg @@ -585,7 +566,6 @@ share/gnome/gcompris/boards/gcompris/timers/sablier7.png share/gnome/gcompris/boards/gcompris/timers/sablier8.png share/gnome/gcompris/boards/gcompris/timers/sablier9.png share/gnome/gcompris/boards/geography.xml -share/gnome/gcompris/boards/geography.xml.in share/gnome/gcompris/boards/geography/Makefile share/gnome/gcompris/boards/geography/Makefile.am share/gnome/gcompris/boards/geography/board1_0.xml @@ -619,9 +599,7 @@ share/gnome/gcompris/boards/geography/southamerica/suriname.png share/gnome/gcompris/boards/geography/southamerica/uruguay.png share/gnome/gcompris/boards/geography/southamerica/venezuela.png share/gnome/gcompris/boards/gletters.xml -share/gnome/gcompris/boards/gletters.xml.in share/gnome/gcompris/boards/imageid.xml -share/gnome/gcompris/boards/imageid.xml.in share/gnome/gcompris/boards/imageid/Makefile share/gnome/gcompris/boards/imageid/Makefile.am share/gnome/gcompris/boards/imageid/ballon.png @@ -635,7 +613,6 @@ share/gnome/gcompris/boards/imageid/imageid-bg.jpg share/gnome/gcompris/boards/imageid/maison.png share/gnome/gcompris/boards/imageid/pomme.png share/gnome/gcompris/boards/imagename.xml -share/gnome/gcompris/boards/imagename.xml.in share/gnome/gcompris/boards/imagename/Makefile share/gnome/gcompris/boards/imagename/Makefile.am share/gnome/gcompris/boards/imagename/board1_0.xml @@ -645,7 +622,6 @@ share/gnome/gcompris/boards/imagename/board4_0.xml share/gnome/gcompris/boards/imagename/board5_0.xml share/gnome/gcompris/boards/imagename/board6_0.xml share/gnome/gcompris/boards/leftright.xml -share/gnome/gcompris/boards/leftright.xml.in share/gnome/gcompris/boards/leftright/background.kpm share/gnome/gcompris/boards/leftright/highlight_torus.png share/gnome/gcompris/boards/leftright/leftright-bg.jpg @@ -666,13 +642,9 @@ share/gnome/gcompris/boards/leftright/main_gauche_paume_180.png share/gnome/gcompris/boards/leftright/main_gauche_paume_270.png share/gnome/gcompris/boards/leftright/main_gauche_paume_90.png share/gnome/gcompris/boards/maze.xml -share/gnome/gcompris/boards/maze.xml.in share/gnome/gcompris/boards/memory.xml -share/gnome/gcompris/boards/memory.xml.in share/gnome/gcompris/boards/menu.xml -share/gnome/gcompris/boards/menu.xml.in share/gnome/gcompris/boards/missing_letter.xml -share/gnome/gcompris/boards/missing_letter.xml.in share/gnome/gcompris/boards/missing_letter/Makefile share/gnome/gcompris/boards/missing_letter/Makefile.am share/gnome/gcompris/boards/missing_letter/board1.xml @@ -713,7 +685,6 @@ share/gnome/gcompris/boards/mrpatate/sherif.png share/gnome/gcompris/boards/mrpatate/watch.png share/gnome/gcompris/boards/music/intro.ogg share/gnome/gcompris/boards/paintings.xml -share/gnome/gcompris/boards/paintings.xml.in share/gnome/gcompris/boards/paintings/Makefile share/gnome/gcompris/boards/paintings/Makefile.am share/gnome/gcompris/boards/paintings/README @@ -771,11 +742,8 @@ share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-7.png share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-8.png share/gnome/gcompris/boards/paratrooper.xml -share/gnome/gcompris/boards/paratrooper.xml.in share/gnome/gcompris/boards/planegame.xml -share/gnome/gcompris/boards/planegame.xml.in share/gnome/gcompris/boards/railroad.xml -share/gnome/gcompris/boards/railroad.xml.in share/gnome/gcompris/boards/railroad/loco1.png share/gnome/gcompris/boards/railroad/loco2.png share/gnome/gcompris/boards/railroad/loco3.png @@ -802,14 +770,10 @@ share/gnome/gcompris/boards/railroad/wagon7.png share/gnome/gcompris/boards/railroad/wagon8.png share/gnome/gcompris/boards/railroad/wagon9.png share/gnome/gcompris/boards/reading.xml -share/gnome/gcompris/boards/reading.xml.in share/gnome/gcompris/boards/reading/gcompris-bg.jpg share/gnome/gcompris/boards/readingh.xml -share/gnome/gcompris/boards/readingh.xml.in share/gnome/gcompris/boards/readingv.xml -share/gnome/gcompris/boards/readingv.xml.in share/gnome/gcompris/boards/reversecount.xml -share/gnome/gcompris/boards/reversecount.xml.in share/gnome/gcompris/boards/reversecount/iceblock.png share/gnome/gcompris/boards/scales/Makefile share/gnome/gcompris/boards/scales/Makefile.am @@ -846,9 +810,7 @@ share/gnome/gcompris/boards/scales/masse8.png share/gnome/gcompris/boards/scales/masse9.png share/gnome/gcompris/boards/scales/scales.png share/gnome/gcompris/boards/scalesboard.xml -share/gnome/gcompris/boards/scalesboard.xml.in share/gnome/gcompris/boards/smallnumbers.xml -share/gnome/gcompris/boards/smallnumbers.xml.in share/gnome/gcompris/boards/sounds/HOWTO_ENCODE share/gnome/gcompris/boards/sounds/de/0.ogg share/gnome/gcompris/boards/sounds/de/1.ogg @@ -1088,10 +1050,8 @@ share/gnome/gcompris/boards/sounds/fr/y.ogg share/gnome/gcompris/boards/sounds/fr/yellow.ogg share/gnome/gcompris/boards/sounds/fr/z.ogg share/gnome/gcompris/boards/target.xml -share/gnome/gcompris/boards/target.xml.in share/gnome/gcompris/boards/target/boardicon.png share/gnome/gcompris/boards/wordsgame.xml -share/gnome/gcompris/boards/wordsgame.xml.in share/gnome/gcompris/boards/wordsgame/README share/gnome/gcompris/boards/wordsgame/wordslevel1.de share/gnome/gcompris/boards/wordsgame/wordslevel1.el diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index 1feb76fecf54..bf2e734ab786 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -19,17 +19,15 @@ RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/games/gcompris2/files/patch-ac b/games/gcompris2/files/patch-ac index dbecd07d983b..bfa9668b8c08 100644 --- a/games/gcompris2/files/patch-ac +++ b/games/gcompris2/files/patch-ac @@ -1,9 +1,9 @@ $FreeBSD$ ---- Makefile.in.orig Thu Apr 18 14:49:06 2002 -+++ Makefile.in Thu Apr 18 14:51:49 2002 -@@ -212,9 +212,9 @@ +--- Makefile.in.orig Sun Aug 4 23:01:03 2002 ++++ Makefile.in Sun Aug 4 23:22:07 2002 +@@ -219,9 +219,9 @@ rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi @@ -16,7 +16,7 @@ $FreeBSD$ mostlyclean-hdr: -@@ -446,7 +446,7 @@ +@@ -453,7 +453,7 @@ install-exec-am: install-exec: install-exec-recursive @@ -25,19 +25,19 @@ $FreeBSD$ install-data-local install-data: install-data-recursive -@@ -519,13 +519,13 @@ +@@ -526,13 +526,13 @@ @$(NORMAL_INSTALL) if test -d @PACKAGE_DATA_DIR@; then \ $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \ - cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ -+ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ ++ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*.bak" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ fi dist-hook: if test -d @PACKAGE_DATA_DIR@; then \ $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \ - cd @PACKAGE_DATA_DIR@ ; tar cf - --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ -+ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ ++ cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.bak" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \ fi clean-local: diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist index bca543125cca..d63f88755160 100644 --- a/games/gcompris2/pkg-plist +++ b/games/gcompris2/pkg-plist @@ -28,14 +28,10 @@ lib/gcompris/libwordsgame.so share/gnome/apps/Games/gcompris.desktop share/gnome/gcompris/boards/Makefile share/gnome/gcompris/boards/Makefile.am -share/gnome/gcompris/boards/Makefile.in share/gnome/gcompris/boards/README share/gnome/gcompris/boards/algebra_by.xml -share/gnome/gcompris/boards/algebra_by.xml.in share/gnome/gcompris/boards/algebra_div.xml -share/gnome/gcompris/boards/algebra_div.xml.in share/gnome/gcompris/boards/algebra_guesscount.xml -share/gnome/gcompris/boards/algebra_guesscount.xml.in share/gnome/gcompris/boards/algebra_guesscount/+.png share/gnome/gcompris/boards/algebra_guesscount/-.png share/gnome/gcompris/boards/algebra_guesscount/1.png @@ -57,13 +53,9 @@ share/gnome/gcompris/boards/algebra_guesscount/algebra_guesscount-bg.jpg share/gnome/gcompris/boards/algebra_guesscount/button.png share/gnome/gcompris/boards/algebra_guesscount/x.png share/gnome/gcompris/boards/algebra_minus.xml -share/gnome/gcompris/boards/algebra_minus.xml.in share/gnome/gcompris/boards/algebra_plus.xml -share/gnome/gcompris/boards/algebra_plus.xml.in share/gnome/gcompris/boards/algebramenu.xml -share/gnome/gcompris/boards/algebramenu.xml.in share/gnome/gcompris/boards/babymatch.xml -share/gnome/gcompris/boards/babymatch.xml.in share/gnome/gcompris/boards/babymatch/Makefile share/gnome/gcompris/boards/babymatch/Makefile.am share/gnome/gcompris/boards/babymatch/board1_0.xml @@ -73,7 +65,6 @@ share/gnome/gcompris/boards/babymatch/board4_0.xml share/gnome/gcompris/boards/babymatch/board5_0.xml share/gnome/gcompris/boards/babymatch/board6_0.xml share/gnome/gcompris/boards/babyshapes.xml -share/gnome/gcompris/boards/babyshapes.xml.in share/gnome/gcompris/boards/babyshapes/T_banana.png share/gnome/gcompris/boards/babyshapes/T_circle.png share/gnome/gcompris/boards/babyshapes/T_colonne.png @@ -166,24 +157,17 @@ share/gnome/gcompris/boards/boardicons/target.png share/gnome/gcompris/boards/boardicons/tuxpara.png share/gnome/gcompris/boards/boardicons/wordsgame.png share/gnome/gcompris/boards/canal_lock.xml -share/gnome/gcompris/boards/canal_lock.xml.in share/gnome/gcompris/boards/canal_lock/canal_lock_bg.png share/gnome/gcompris/boards/click_on_letter.xml -share/gnome/gcompris/boards/click_on_letter.xml.in share/gnome/gcompris/boards/clickgame.xml -share/gnome/gcompris/boards/clickgame.xml.in share/gnome/gcompris/boards/clockgame.xml -share/gnome/gcompris/boards/clockgame.xml.in share/gnome/gcompris/boards/clockgame/clockgame-bg.jpg share/gnome/gcompris/boards/colors.xml -share/gnome/gcompris/boards/colors.xml.in share/gnome/gcompris/boards/colors/colors_bg.jpg share/gnome/gcompris/boards/colors/colors_highlight.png share/gnome/gcompris/boards/computer.xml -share/gnome/gcompris/boards/computer.xml.in share/gnome/gcompris/boards/dataset/mrpatate.xml share/gnome/gcompris/boards/doubleentry.xml -share/gnome/gcompris/boards/doubleentry.xml.in share/gnome/gcompris/boards/doubleentry/Makefile share/gnome/gcompris/boards/doubleentry/Makefile.am share/gnome/gcompris/boards/doubleentry/board1_0.xml @@ -216,7 +200,6 @@ share/gnome/gcompris/boards/doubleentry/circle-red-2.png share/gnome/gcompris/boards/doubleentry/circle-red-3.png share/gnome/gcompris/boards/doubleentry/gcompris-bg.png share/gnome/gcompris/boards/draw.xml -share/gnome/gcompris/boards/draw.xml.in share/gnome/gcompris/boards/draw/color-selector.jpg share/gnome/gcompris/boards/draw/draw-bg.jpg share/gnome/gcompris/boards/draw/tool-circle.png @@ -247,7 +230,6 @@ share/gnome/gcompris/boards/draw/tool-select.png share/gnome/gcompris/boards/draw/tool-select_on.png share/gnome/gcompris/boards/draw/tool-selector.jpg share/gnome/gcompris/boards/erase.xml -share/gnome/gcompris/boards/erase.xml.in share/gnome/gcompris/boards/fishes/QueenAngel_0.png share/gnome/gcompris/boards/fishes/QueenAngel_1.png share/gnome/gcompris/boards/fishes/blueking2_0.png @@ -356,7 +338,6 @@ share/gnome/gcompris/boards/flags/tr.png share/gnome/gcompris/boards/flags/uy.png share/gnome/gcompris/boards/flags/yu.png share/gnome/gcompris/boards/fun.xml -share/gnome/gcompris/boards/fun.xml.in share/gnome/gcompris/boards/gcompris/README share/gnome/gcompris/boards/gcompris/animals/bear001.jpg share/gnome/gcompris/boards/gcompris/animals/joybear001.jpg @@ -585,7 +566,6 @@ share/gnome/gcompris/boards/gcompris/timers/sablier7.png share/gnome/gcompris/boards/gcompris/timers/sablier8.png share/gnome/gcompris/boards/gcompris/timers/sablier9.png share/gnome/gcompris/boards/geography.xml -share/gnome/gcompris/boards/geography.xml.in share/gnome/gcompris/boards/geography/Makefile share/gnome/gcompris/boards/geography/Makefile.am share/gnome/gcompris/boards/geography/board1_0.xml @@ -619,9 +599,7 @@ share/gnome/gcompris/boards/geography/southamerica/suriname.png share/gnome/gcompris/boards/geography/southamerica/uruguay.png share/gnome/gcompris/boards/geography/southamerica/venezuela.png share/gnome/gcompris/boards/gletters.xml -share/gnome/gcompris/boards/gletters.xml.in share/gnome/gcompris/boards/imageid.xml -share/gnome/gcompris/boards/imageid.xml.in share/gnome/gcompris/boards/imageid/Makefile share/gnome/gcompris/boards/imageid/Makefile.am share/gnome/gcompris/boards/imageid/ballon.png @@ -635,7 +613,6 @@ share/gnome/gcompris/boards/imageid/imageid-bg.jpg share/gnome/gcompris/boards/imageid/maison.png share/gnome/gcompris/boards/imageid/pomme.png share/gnome/gcompris/boards/imagename.xml -share/gnome/gcompris/boards/imagename.xml.in share/gnome/gcompris/boards/imagename/Makefile share/gnome/gcompris/boards/imagename/Makefile.am share/gnome/gcompris/boards/imagename/board1_0.xml @@ -645,7 +622,6 @@ share/gnome/gcompris/boards/imagename/board4_0.xml share/gnome/gcompris/boards/imagename/board5_0.xml share/gnome/gcompris/boards/imagename/board6_0.xml share/gnome/gcompris/boards/leftright.xml -share/gnome/gcompris/boards/leftright.xml.in share/gnome/gcompris/boards/leftright/background.kpm share/gnome/gcompris/boards/leftright/highlight_torus.png share/gnome/gcompris/boards/leftright/leftright-bg.jpg @@ -666,13 +642,9 @@ share/gnome/gcompris/boards/leftright/main_gauche_paume_180.png share/gnome/gcompris/boards/leftright/main_gauche_paume_270.png share/gnome/gcompris/boards/leftright/main_gauche_paume_90.png share/gnome/gcompris/boards/maze.xml -share/gnome/gcompris/boards/maze.xml.in share/gnome/gcompris/boards/memory.xml -share/gnome/gcompris/boards/memory.xml.in share/gnome/gcompris/boards/menu.xml -share/gnome/gcompris/boards/menu.xml.in share/gnome/gcompris/boards/missing_letter.xml -share/gnome/gcompris/boards/missing_letter.xml.in share/gnome/gcompris/boards/missing_letter/Makefile share/gnome/gcompris/boards/missing_letter/Makefile.am share/gnome/gcompris/boards/missing_letter/board1.xml @@ -713,7 +685,6 @@ share/gnome/gcompris/boards/mrpatate/sherif.png share/gnome/gcompris/boards/mrpatate/watch.png share/gnome/gcompris/boards/music/intro.ogg share/gnome/gcompris/boards/paintings.xml -share/gnome/gcompris/boards/paintings.xml.in share/gnome/gcompris/boards/paintings/Makefile share/gnome/gcompris/boards/paintings/Makefile.am share/gnome/gcompris/boards/paintings/README @@ -771,11 +742,8 @@ share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-7.png share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-8.png share/gnome/gcompris/boards/paratrooper.xml -share/gnome/gcompris/boards/paratrooper.xml.in share/gnome/gcompris/boards/planegame.xml -share/gnome/gcompris/boards/planegame.xml.in share/gnome/gcompris/boards/railroad.xml -share/gnome/gcompris/boards/railroad.xml.in share/gnome/gcompris/boards/railroad/loco1.png share/gnome/gcompris/boards/railroad/loco2.png share/gnome/gcompris/boards/railroad/loco3.png @@ -802,14 +770,10 @@ share/gnome/gcompris/boards/railroad/wagon7.png share/gnome/gcompris/boards/railroad/wagon8.png share/gnome/gcompris/boards/railroad/wagon9.png share/gnome/gcompris/boards/reading.xml -share/gnome/gcompris/boards/reading.xml.in share/gnome/gcompris/boards/reading/gcompris-bg.jpg share/gnome/gcompris/boards/readingh.xml -share/gnome/gcompris/boards/readingh.xml.in share/gnome/gcompris/boards/readingv.xml -share/gnome/gcompris/boards/readingv.xml.in share/gnome/gcompris/boards/reversecount.xml -share/gnome/gcompris/boards/reversecount.xml.in share/gnome/gcompris/boards/reversecount/iceblock.png share/gnome/gcompris/boards/scales/Makefile share/gnome/gcompris/boards/scales/Makefile.am @@ -846,9 +810,7 @@ share/gnome/gcompris/boards/scales/masse8.png share/gnome/gcompris/boards/scales/masse9.png share/gnome/gcompris/boards/scales/scales.png share/gnome/gcompris/boards/scalesboard.xml -share/gnome/gcompris/boards/scalesboard.xml.in share/gnome/gcompris/boards/smallnumbers.xml -share/gnome/gcompris/boards/smallnumbers.xml.in share/gnome/gcompris/boards/sounds/HOWTO_ENCODE share/gnome/gcompris/boards/sounds/de/0.ogg share/gnome/gcompris/boards/sounds/de/1.ogg @@ -1088,10 +1050,8 @@ share/gnome/gcompris/boards/sounds/fr/y.ogg share/gnome/gcompris/boards/sounds/fr/yellow.ogg share/gnome/gcompris/boards/sounds/fr/z.ogg share/gnome/gcompris/boards/target.xml -share/gnome/gcompris/boards/target.xml.in share/gnome/gcompris/boards/target/boardicon.png share/gnome/gcompris/boards/wordsgame.xml -share/gnome/gcompris/boards/wordsgame.xml.in share/gnome/gcompris/boards/wordsgame/README share/gnome/gcompris/boards/wordsgame/wordslevel1.de share/gnome/gcompris/boards/wordsgame/wordslevel1.el diff --git a/games/gniffel/Makefile b/games/gniffel/Makefile index 7f7b256e1d61..5f403ad7a5e2 100644 --- a/games/gniffel/Makefile +++ b/games/gniffel/Makefile @@ -15,16 +15,14 @@ MAINTAINER= sobomax@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile index 74556a3c7429..3b347d306ad1 100644 --- a/games/gnomebreakout/Makefile +++ b/games/gnomebreakout/Makefile @@ -15,16 +15,14 @@ MAINTAINER= ports@FreeBSD.org USE_REINPLACE= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \ - s|\$$(datadir)/locale|\$$(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile index dc6e893732ff..7d067204d828 100644 --- a/games/gnomememoryblocks/Makefile +++ b/games/gnomememoryblocks/Makefile @@ -16,16 +16,14 @@ MAINTAINER= ports@FreeBSD.org USE_REINPLACE= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \ - s|\$$(datadir)/locale|\$$(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile index 519581ca7091..a069c6362f10 100644 --- a/games/gnomermind/Makefile +++ b/games/gnomermind/Makefile @@ -13,22 +13,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old - USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - MSGFMT="${LOCALBASE}/bin/msgfmt-old" \ - XGETTEXT="${LOCALBASE}/bin/xgettext-old" + LIBS="-L${LOCALBASE}/lib" +MAKE_ENV= OLD_PO_FILE_INPUT=1 -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile index 67a3576a6fd8..8e05776eb2dd 100644 --- a/games/gtktetcolor/Makefile +++ b/games/gtktetcolor/Makefile @@ -16,16 +16,14 @@ MAINTAINER= sobomax@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gnomelibs GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index 9dbf216431af..78df6d10f929 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -14,21 +14,16 @@ DISTNAME= gnome-iconedit-${PORTVERSION} MAINTAINER= ports@FreeBSD.org USE_REINPLACE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint USE_GMAKE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes - -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \ - s|\$$(datadir)/locale|\$$(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/graphics/gnomeiconedit/files/patch-ab b/graphics/gnomeiconedit/files/patch-ab deleted file mode 100644 index 31c7139b0073..000000000000 --- a/graphics/gnomeiconedit/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Sat Jan 22 11:35:29 2000 -+++ po/Makefile.in.in Fri Jan 28 16:08:48 2000 -@@ -18,7 +18,7 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/@DATADIRNAME@ -+datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po diff --git a/graphics/gnomeiconedit/files/patch-src::Makefile.in b/graphics/gnomeiconedit/files/patch-src::Makefile.in index c0e2e07a4997..98b99558f1b5 100644 --- a/graphics/gnomeiconedit/files/patch-src::Makefile.in +++ b/graphics/gnomeiconedit/files/patch-src::Makefile.in @@ -1,14 +1,14 @@ $FreeBSD$ ---- src/Makefile.in 2001/12/19 10:47:52 1.1 -+++ src/Makefile.in 2001/12/19 10:54:53 +--- src/Makefile.in.orig Mon Aug 5 00:12:19 2002 ++++ src/Makefile.in Mon Aug 5 00:13:01 2002 @@ -118,7 +118,7 @@ bin_PROGRAMS = gnome-iconedit $(COMPONENT) -INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEDATADIR=\""$(datadir)"\" -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src/widgets $(GNOME_INCLUDEDIR) -+INCLUDES = $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEDATADIR=\""$(datadir)"\" -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src/widgets $(GNOME_INCLUDEDIR) ++INCLUDES = $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEDATADIR=\""$(datadir)"\" -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src/widgets $(GNOME_INCLUDEDIR) CORBA_GENERATED = Iconedit.h Iconedit-stubs.c Iconedit-skels.c Iconedit-common.c diff --git a/graphics/gnomeiconedit/pkg-plist b/graphics/gnomeiconedit/pkg-plist index d9b8ed76c1da..e05764d0b20f 100644 --- a/graphics/gnomeiconedit/pkg-plist +++ b/graphics/gnomeiconedit/pkg-plist @@ -23,6 +23,7 @@ share/locale/de/LC_MESSAGES/gnome-iconedit.mo share/locale/en_GB/LC_MESSAGES/gnome-iconedit.mo share/locale/fr/LC_MESSAGES/gnome-iconedit.mo share/locale/ko/LC_MESSAGES/gnome-iconedit.mo +share/locale/ru/LC_MESSAGES/gnome-iconedit.mo share/locale/sv/LC_MESSAGES/gnome-iconedit.mo share/locale/tr/LC_MESSAGES/gnome-iconedit.mo share/locale/wa/LC_MESSAGES/gnome-iconedit.mo diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile index a6f0a1852224..6fa991d76c08 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -14,16 +14,14 @@ MAINTAINER= sobomax@FreeBSD.org USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack gdkpixbuf gnomeprint GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 3012c918cbf4..109a0a5b6937 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -15,17 +15,15 @@ MAINTAINER?= gnome@FreeBSD.org USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack bonobo gnomevfs +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ +post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|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' .include <bsd.port.mk> diff --git a/x11-toolkits/gdl/files/patch-Makefile.in b/x11-toolkits/gdl/files/patch-Makefile.in index a6f6a1be7bf4..a5db1625bf00 100644 --- a/x11-toolkits/gdl/files/patch-Makefile.in +++ b/x11-toolkits/gdl/files/patch-Makefile.in @@ -1,14 +1,10 @@ $FreeBSD$ ---- Makefile.in 2001/07/24 11:08:03 1.1 -+++ Makefile.in 2001/07/24 11:09:14 -@@ -146,10 +146,10 @@ - - SUBDIRS = idl gdl scintilla-control po intl - --m4datadir = $(datadir)/aclocal -+m4datadir = $(prefix)/share/aclocal +--- Makefile.in.orig Mon Aug 5 00:16:11 2002 ++++ Makefile.in Mon Aug 5 00:16:47 2002 +@@ -149,7 +149,7 @@ + m4datadir = $(prefix)/share/aclocal m4data_DATA = gdl.m4 -confexecdir = $(libdir) diff --git a/x11-toolkits/gdl/files/patch-configure b/x11-toolkits/gdl/files/patch-configure new file mode 100644 index 000000000000..d1fec8a86595 --- /dev/null +++ b/x11-toolkits/gdl/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- configure 2002/08/04 21:18:58 1.1 ++++ configure 2002/08/04 21:19:10 +@@ -5853,6 +5853,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-toolkits/gdl/files/patch-ltmain.sh b/x11-toolkits/gdl/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/x11-toolkits/gdl/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in b/x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in new file mode 100644 index 000000000000..589bee588e14 --- /dev/null +++ b/x11-toolkits/gdl/files/patch-scintilla-control::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- scintilla-control/Makefile.in 2002/08/04 21:44:30 1.1 ++++ scintilla-control/Makefile.in 2002/08/04 21:45:56 +@@ -198,7 +198,7 @@ + test_scintilla_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) ++CCLD = $(CXX) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + DATA = $(oaf_DATA) $(ui_DATA) + |