diff options
| author | Steve Price <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 2000-07-07 19:59:26 +0000 |
| commit | 89b7d2a4465628b128b8f5f7fde5f2a3e2b2a8df (patch) | |
| tree | dab293772a4c12d5e7f6c0f30c1e8ae09e1cfe4d /x11-clocks | |
| parent | Location on MASTER_SITE has changed. (diff) | |
- 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>
Notes
Notes:
svn path=/head/; revision=30342
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/asclock-gtk/Makefile | 6 | ||||
| -rw-r--r-- | x11-clocks/asclock-gtk/files/patch-aa | 34 |
2 files changed, 23 insertions, 17 deletions
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile index 271adc5bfd6f..8ce9ca242723 100644 --- a/x11-clocks/asclock-gtk/Makefile +++ b/x11-clocks/asclock-gtk/Makefile @@ -15,9 +15,13 @@ MAINTAINER= kuriyama@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +WRKSRC= ${WRKDIR}/${PORTNAME} + HAS_CONFIGURE= YES -WRKSRC= ${WRKDIR}/asclock-gtk USE_X_PREFIX= YES +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" ALL_TARGET= asclock .if defined(BATCH) diff --git a/x11-clocks/asclock-gtk/files/patch-aa b/x11-clocks/asclock-gtk/files/patch-aa index 386a53512920..2fce2ef50671 100644 --- a/x11-clocks/asclock-gtk/files/patch-aa +++ b/x11-clocks/asclock-gtk/files/patch-aa @@ -1,13 +1,15 @@ --- Makefile.orig Fri Mar 26 16:08:33 1999 -+++ Makefile Wed May 5 12:23:28 1999 -@@ -2,18 +2,19 @@ ++++ Makefile Sat Jul 1 17:43:08 2000 +@@ -1,19 +1,20 @@ + CP=cp -f MKDIR=mkdir -p - CFLAGS = -Wall -g +-CFLAGS = -Wall -g ++CFLAGS?= -Wall -g +PREFIX?= /usr/local -GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \ -+GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ ++GNOME_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk` GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \ .gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o @@ -16,11 +18,11 @@ -GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \ - -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags` -+GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ -+ -DASCLOCK_GTK `$(CONFIG_PATH)gtk12-config --cflags` ++GTK_CC = $(CC) $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ ++ -DASCLOCK_GTK `$(GTK_CONFIG) --cflags` GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o -GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs` -+GTK_LIBS = `$(CONFIG_PATH)gtk12-config --libs` ++GTK_LIBS = `$(GTK_CONFIG) --libs` info: default_theme @@ -46,24 +48,24 @@ - $(MKDIR) /usr/local/share/asclock/themes/shaped - $(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped -# $(CP) -rf themes/* /usr/local/share/asclock/ -+ $(CP) asclock ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} asclock ${PREFIX}/bin + $(MKDIR) ${PREFIX}/share/asclock + $(MKDIR) ${PREFIX}/share/asclock/themes + $(MKDIR) ${PREFIX}/share/asclock/themes/Newstone -+ $(CP) themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone ++ ${BSD_INSTALL_DATA} themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone + $(MKDIR) ${PREFIX}/share/asclock/themes/Orb -+ $(CP) themes/Orb/* ${PREFIX}/share/asclock/themes/Orb ++ ${BSD_INSTALL_DATA} themes/Orb/* ${PREFIX}/share/asclock/themes/Orb + $(MKDIR) ${PREFIX}/share/asclock/themes/Stone -+ $(CP) themes/Stone/* ${PREFIX}/share/asclock/themes/Stone ++ ${BSD_INSTALL_DATA} themes/Stone/* ${PREFIX}/share/asclock/themes/Stone + $(MKDIR) ${PREFIX}/share/asclock/themes/analog -+ $(CP) themes/analog/* ${PREFIX}/share/asclock/themes/analog ++ ${BSD_INSTALL_DATA} themes/analog/* ${PREFIX}/share/asclock/themes/analog + $(MKDIR) ${PREFIX}/share/asclock/themes/beats -+ $(CP) themes/beats/* ${PREFIX}/share/asclock/themes/beats ++ ${BSD_INSTALL_DATA} themes/beats/* ${PREFIX}/share/asclock/themes/beats + $(MKDIR) ${PREFIX}/share/asclock/themes/classic -+ $(CP) themes/classic/* ${PREFIX}/share/asclock/themes/classic ++ ${BSD_INSTALL_DATA} themes/classic/* ${PREFIX}/share/asclock/themes/classic + $(MKDIR) ${PREFIX}/share/asclock/themes/shaped -+ $(CP) themes/shaped/* ${PREFIX}/share/asclock/themes/shaped -+# $(CP) -rf themes/* ${PREFIX}/share/asclock/ ++ ${BSD_INSTALL_DATA} themes/shaped/* ${PREFIX}/share/asclock/themes/shaped ++# ${BSD_INSTALL_DATA} -rf themes/* ${PREFIX}/share/asclock/ clean: rm -rf core *.o *~ .gtk .gnome asclock asclock_applet |