diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile index 5e420ffcd162..3c820c4ad1e9 100644 --- a/x11/gromit/Makefile +++ b/x11/gromit/Makefile @@ -19,16 +19,10 @@ USE_GNOME= gtk20 DOCS= AUTHORS ChangeLog README -post-extract: - @${REINPLACE_CMD} -e 's|gcc|$${CC}|' \ - -e 's|`gtk-config|$${CFLAGS} `pkg-config gtk\+-2.0|' \ - ${WRKSRC}/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gromit ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/gromitrc ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/sawfish-config ${EXAMPLESDIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} diff --git a/x11/gromit/files/patch-Makefile b/x11/gromit/files/patch-Makefile index c3658a54f1c7..0f41bedb2776 100644 --- a/x11/gromit/files/patch-Makefile +++ b/x11/gromit/files/patch-Makefile @@ -1,8 +1,11 @@ ---- Makefile.orig Mon Mar 3 18:45:09 2003 -+++ Makefile Mon Mar 3 18:45:27 2003 -@@ -1,4 +1,4 @@ - all: gromit + +$FreeBSD$ + +--- Makefile.orig ++++ Makefile +@@ -7,4 +7,4 @@ + gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags` gromit: gromit.c Makefile -- gcc -o gromit gromit.c -Wall `gtk-config --libs --cflags` -+ ${CC} -o gromit gromit.c ${CFLAGS} `${GTK_CONFIG} --libs --cflags` +- gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0` ++ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0` diff --git a/x11/gromit/pkg-plist b/x11/gromit/pkg-plist index 7295bdee63ec..0dd5ffa69ea8 100644 --- a/x11/gromit/pkg-plist +++ b/x11/gromit/pkg-plist @@ -1,6 +1,5 @@ bin/gromit %%EXAMPLESDIR%%/gromitrc -%%EXAMPLESDIR%%/sawfish-config @dirrm %%EXAMPLESDIR%% %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog