diff options
| author | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
| commit | 7879264d29ab2a706345ab21de9f9cd3139efc7a (patch) | |
| tree | 0fb8a7b052271f54c6bdf617de3027472d998225 /misc | |
| parent | c691dd330a3da8e70bfc74508b9fb3b585604a4d (diff) | |
| download | FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.zip FreeBSD-ports-7879264d29ab2a706345ab21de9f9cd3139efc7a.tar.gz | |
- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config
- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly
PR: 19623
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/snowflake/Makefile | 3 | ||||
| -rw-r--r-- | misc/snowflake/files/patch-aa | 28 |
2 files changed, 21 insertions, 10 deletions
diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile index ba0fa39..6b7dcc1 100644 --- a/misc/snowflake/Makefile +++ b/misc/snowflake/Makefile @@ -15,7 +15,10 @@ MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/snowflake ${PREFIX}/bin diff --git a/misc/snowflake/files/patch-aa b/misc/snowflake/files/patch-aa index b4efd23..013d4d1 100644 --- a/misc/snowflake/files/patch-aa +++ b/misc/snowflake/files/patch-aa @@ -1,19 +1,27 @@ ---- Makefile.orig Sat Jan 29 20:20:01 2000 -+++ Makefile Sat Jan 29 20:20:18 2000 -@@ -11,10 +11,10 @@ +--- Makefile.orig Mon Dec 21 08:18:55 1998 ++++ Makefile Sat Jul 1 18:36:45 2000 +@@ -1,6 +1,6 @@ + # Makefile + +-CC = gcc ++CC ?= gcc + + SRCS = sf.c sf_control.c sf_generate.c sf_view.c getopt.c + OBJS = $(SRCS:.c=.o) +@@ -11,13 +11,13 @@ all: snowflake .c.o: - $(CC) `gtk-config --cflags` -c $*.c -o $*.o -+ $(CC) `gtk12-config --cflags` -c $*.c -o $*.o ++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o snowflake: $(OBJS) - $(CC) `gtk-config --libs` $(OBJS) -o $@ -+ $(CC) `gtk12-config --libs` $(OBJS) -o $@ ++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --libs` $(OBJS) -o $@ getopt: getopt.c - $(CC) -DTEST_LONG_OPTIONS $< -o $@ -@@ -26,4 +26,4 @@ - sf_control.o: $(HDRS) - sf_generate.o: $(HDRS) - sf_view.o: $(HDRS) $(INCS) +- $(CC) -DTEST_LONG_OPTIONS $< -o $@ ++ $(CC) $(CFLAGS) -DTEST_LONG_OPTIONS $< -o $@ + + clean: + rm -f *~ *.o snowflake |
