Date: Fri, 1 Feb 2019 14:39:57 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491817 - in head/x11-clocks/wmfishtime: . files Message-ID: <201902011439.x11EdvO9084183@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Feb 1 14:39:57 2019 New Revision: 491817 URL: https://svnweb.freebsd.org/changeset/ports/491817 Log: x11-clocks/wmfishtime: Remove GTK1 option x11-toolkits/gtk12 is gone since r488008. Modified: head/x11-clocks/wmfishtime/Makefile head/x11-clocks/wmfishtime/files/patch-Makefile Modified: head/x11-clocks/wmfishtime/Makefile ============================================================================== --- head/x11-clocks/wmfishtime/Makefile Fri Feb 1 14:35:31 2019 (r491816) +++ head/x11-clocks/wmfishtime/Makefile Fri Feb 1 14:39:57 2019 (r491817) @@ -3,7 +3,7 @@ PORTNAME= wmfishtime PORTVERSION= 1.24 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-clocks windowmaker MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \ http://www.sourcefiles.org/Toys/Clocks/ @@ -14,24 +14,16 @@ COMMENT= Time/date applet for WindowMaker with fishes LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= pkgconfig +USES= gnome pkgconfig +USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_XORG= x11 -MAKE_ARGS+= CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall ${GTK_CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - GTK_LIBS="${GTK_LIBS}" +MAKE_ARGS= CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall" \ + LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/wmfishtime man/man1/wmfishtime.1.gz -OPTIONS_SINGLE= TOOLKIT -OPTIONS_SINGLE_TOOLKIT= GTK1 GTK2 -OPTIONS_DEFAULT= GTK2 - -GTK1_USE= gnome=gtk12 -GTK1_CPPFLAGS= $$(pkg-config --cflags gdk) -GTK1_LDFLAGS= $$(pkg-config --libs gdk) -GTK2_USE= gnome=gtk20 -GTK2_CPPFLAGS= $$(pkg-config --cflags gdk-x11-2.0 x11) -GTK2_LDFLAGS= $$(pkg-config --libs gdk-x11-2.0 x11) -lm -TOOLKIT_DESC= GTK Toolkit +CPPFLAGS+= $$(pkg-config --cflags gdk-x11-2.0 x11) +LDFLAGS+= $$(pkg-config --libs gdk-x11-2.0 x11) -lm post-patch: ${REINPLACE_CMD} -E -e 's|1\.23|${PORTVERSION}|g' ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1 Modified: head/x11-clocks/wmfishtime/files/patch-Makefile ============================================================================== --- head/x11-clocks/wmfishtime/files/patch-Makefile Fri Feb 1 14:35:31 2019 (r491816) +++ head/x11-clocks/wmfishtime/files/patch-Makefile Fri Feb 1 14:39:57 2019 (r491817) @@ -1,6 +1,6 @@ ---- Makefile.orig Sun May 27 05:49:41 2001 -+++ Makefile Sun Jul 6 20:29:07 2003 -@@ -6,23 +6,21 @@ +--- Makefile.orig 2001-05-26 20:49:41 UTC ++++ Makefile +@@ -6,23 +6,21 @@ PREFIX = $(DESTDIR)/usr/X11R6 # no user serviceable parts below this line # optimization cflags @@ -15,7 +15,7 @@ SHELL = sh OBJS = fishmon.o -LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -+LIBS = `echo $(GTK_LIBS) | sed "s/-lgtk12//g"` ++LIBS = INSTALL = -m 755 all: wmfishtime
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902011439.x11EdvO9084183>