diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:42:57 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 06:42:57 +0000 |
| commit | 99290b0d61db9bcb3c960f5507a8ccb0126a0cf9 (patch) | |
| tree | bac8f356dc259524716a41398446e5c7d8f95a21 /x11 | |
| parent | Implement USE_GTK, part 1. (diff) | |
Implement USE_GTK, part 2.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gmessage/Makefile | 6 | ||||
| -rw-r--r-- | x11/gtk-theme-switch/Makefile | 2 | ||||
| -rw-r--r-- | x11/gtk-theme-switch/files/patch-aa | 4 | ||||
| -rw-r--r-- | x11/gtk-theme-switch2/Makefile | 2 | ||||
| -rw-r--r-- | x11/gtk-theme-switch2/files/patch-aa | 4 | ||||
| -rw-r--r-- | x11/gyroscope/Makefile | 7 | ||||
| -rw-r--r-- | x11/gyroscope/files/patch-aa | 2 |
7 files changed, 10 insertions, 17 deletions
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile index bc8018a2b9f2..493d786727a8 100644 --- a/x11/gmessage/Makefile +++ b/x11/gmessage/Makefile @@ -12,11 +12,7 @@ MASTER_SITES= http://www.math.uni-goettingen.de/dadler/gmessage/ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes .include <bsd.port.mk> diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile index 626c3fdf5931..2a17716a69d4 100644 --- a/x11/gtk-theme-switch/Makefile +++ b/x11/gtk-theme-switch/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.muhri.net/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk USE_X_PREFIX= yes +USE_GTK= yes .if !defined(NOPORTDOCS) post-install: diff --git a/x11/gtk-theme-switch/files/patch-aa b/x11/gtk-theme-switch/files/patch-aa index e553cc87cf86..43ec8b03adef 100644 --- a/x11/gtk-theme-switch/files/patch-aa +++ b/x11/gtk-theme-switch/files/patch-aa @@ -7,8 +7,8 @@ -LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GCC = ${CC} +PREFIX?=/usr/local -+CFLAGS += `${X11BASE}/bin/gtk12-config --cflags` -+LIBS = `${X11BASE}/bin/gtk12-config --libs` ++CFLAGS += `${GTK_CONFIG} --cflags` ++LIBS = `${GTK_CONFIG} --libs` VERSION = 0.4 all : gthemeswitch diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile index 626c3fdf5931..2a17716a69d4 100644 --- a/x11/gtk-theme-switch2/Makefile +++ b/x11/gtk-theme-switch2/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.muhri.net/ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk USE_X_PREFIX= yes +USE_GTK= yes .if !defined(NOPORTDOCS) post-install: diff --git a/x11/gtk-theme-switch2/files/patch-aa b/x11/gtk-theme-switch2/files/patch-aa index e553cc87cf86..43ec8b03adef 100644 --- a/x11/gtk-theme-switch2/files/patch-aa +++ b/x11/gtk-theme-switch2/files/patch-aa @@ -7,8 +7,8 @@ -LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +GCC = ${CC} +PREFIX?=/usr/local -+CFLAGS += `${X11BASE}/bin/gtk12-config --cflags` -+LIBS = `${X11BASE}/bin/gtk12-config --libs` ++CFLAGS += `${GTK_CONFIG} --cflags` ++LIBS = `${GTK_CONFIG} --libs` VERSION = 0.4 all : gthemeswitch diff --git a/x11/gyroscope/Makefile b/x11/gyroscope/Makefile index e7326500c1e7..9c9a3d849a6b 100644 --- a/x11/gyroscope/Makefile +++ b/x11/gyroscope/Makefile @@ -12,14 +12,11 @@ MASTER_SITES= http://soupnazi.org/FreeBSD/ports/distfiles/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config - WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes -MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_GTK= yes + ALL_TARGET= # empty .include <bsd.port.mk> diff --git a/x11/gyroscope/files/patch-aa b/x11/gyroscope/files/patch-aa index 82cb04fefa7c..c012ee216243 100644 --- a/x11/gyroscope/files/patch-aa +++ b/x11/gyroscope/files/patch-aa @@ -28,4 +28,4 @@ install: - cp ./$(BINARYNAME) $(BIN_DIR)$(BINARYNAME) -+ @/usr/bin/install -c -o 0 -g 0 -s -m 1755 ${BINARYNAME} ${BIN_DIR}/${BINARYNAME} ++ ${BSD_INSTALL_PROGRAM} ${BINARYNAME} ${BIN_DIR}/${BINARYNAME} |