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-wm | |
| 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>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/spager/Makefile | 19 | ||||
| -rw-r--r-- | x11-wm/spager/files/patch-aa | 14 | ||||
| -rw-r--r-- | x11-wm/spager/files/patch-ab | 4 |
3 files changed, 21 insertions, 16 deletions
diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile index 6bdde05b69b5..826605459cd7 100644 --- a/x11-wm/spager/Makefile +++ b/x11-wm/spager/Makefile @@ -13,25 +13,26 @@ MASTER_SITES= http://www.stanford.edu/~satyakid/ MAINTAINER= nakai@FreeBSD.org RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -ALL_TARGET= spager USE_X_PREFIX= yes +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" +ALL_TARGET= spager -pre-build: +post-extract: ${RM} -f ${WRKSRC}/spager +post-patch: + ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/ ${MKDIR} ${PREFIX}/share/spager ${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${PREFIX}/share/spager ${INSTALL_SCRIPT} ${WRKSRC}/x-message.jl ${PREFIX}/share/spager ${INSTALL_DATA} ${WRKSRC}/sample.rc ${PREFIX}/share/spager - -post-install: - @${ECHO_MSG} "*******************************************" - @${ECHO_MSG} " Append ${PREFIX}/share/spager/sample.rc " - @${ECHO_MSG} " to your ~/.sawfishrc" - @${ECHO_MSG} "*******************************************" + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-wm/spager/files/patch-aa b/x11-wm/spager/files/patch-aa index d7711bb24cc4..a7f7840fb5f8 100644 --- a/x11-wm/spager/files/patch-aa +++ b/x11-wm/spager/files/patch-aa @@ -1,11 +1,15 @@ ---- Makefile.orig Mon Jun 5 12:39:44 2000 -+++ Makefile Mon Jun 5 12:39:52 2000 -@@ -21,7 +21,7 @@ - CC = gcc +--- Makefile.orig Mon May 22 04:36:02 2000 ++++ Makefile Sat Jul 1 17:39:37 2000 +@@ -18,10 +18,10 @@ + # along with spager; see the file COPYING. If not, write to + # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +-CC = gcc ++CC ?= gcc spager: spager.c - $(CC) -O6 -Wall `gtk-config --cflags` spager.c -o spager `gtk-config --libs` -+ $(CC) -O6 -Wall `gtk12-config --cflags` spager.c -o spager `gtk12-config --libs` ++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` spager.c -o spager `$(GTK_CONFIG) --libs` clean: rm -f *.o spager diff --git a/x11-wm/spager/files/patch-ab b/x11-wm/spager/files/patch-ab index dc165a395c65..1b8942d74ae0 100644 --- a/x11-wm/spager/files/patch-ab +++ b/x11-wm/spager/files/patch-ab @@ -5,8 +5,8 @@ ;; This is the directory where the archive is untarred. -(setq spager-directory "/home/satyaki/spager") -+(setq spager-directory "/usr/X11R6/share/spager") -+(setq spager-bin-directory "/usr/X11R6/bin") ++(setq spager-directory "%%PREFIX%%/share/spager") ++(setq spager-bin-directory "%%PREFIX%%/bin") ;; I don't think you need to change anything under this line... (setq load-path (cons spager-directory load-path)) |