diff options
author | amdmi3 <amdmi3@FreeBSD.org> | 2009-06-02 02:01:05 +0800 |
---|---|---|
committer | amdmi3 <amdmi3@FreeBSD.org> | 2009-06-02 02:01:05 +0800 |
commit | 909991bba59b045da9f89da3325cbc94eea7b6f0 (patch) | |
tree | a51fe987f1c1269866a966801d120f38a4fdbe7d | |
parent | 149041c2d1f46160a61d43b1c2befb774e96d5ea (diff) | |
download | freebsd-ports-gnome-909991bba59b045da9f89da3325cbc94eea7b6f0.tar.gz freebsd-ports-gnome-909991bba59b045da9f89da3325cbc94eea7b6f0.tar.zst freebsd-ports-gnome-909991bba59b045da9f89da3325cbc94eea7b6f0.zip |
- Respect PREFIX/LOCALBASE
Reported by: QATty
-rw-r--r-- | chinese/xttmgr/Makefile | 1 | ||||
-rw-r--r-- | chinese/xttmgr/files/patch-Makefile | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/chinese/xttmgr/Makefile b/chinese/xttmgr/Makefile index 6a8e647755fa..6fdd50a75d0c 100644 --- a/chinese/xttmgr/Makefile +++ b/chinese/xttmgr/Makefile @@ -7,6 +7,7 @@ PORTNAME= xttmgr PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= chinese MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/statue/xttmgr/ diff --git a/chinese/xttmgr/files/patch-Makefile b/chinese/xttmgr/files/patch-Makefile index 2248c3e5c2c7..2ad92dafbf1d 100644 --- a/chinese/xttmgr/files/patch-Makefile +++ b/chinese/xttmgr/files/patch-Makefile @@ -1,17 +1,17 @@ ---- Makefile.orig Thu May 8 08:41:13 2003 -+++ Makefile Mon Jun 23 22:44:18 2003 -@@ -1,16 +1,16 @@ +--- Makefile.orig 2003-05-08 04:41:13.000000000 +0400 ++++ Makefile 2009-06-01 21:24:03.000000000 +0400 +@@ -1,16 +1,15 @@ -FREETYPE_BASE=/usr -FREETYPE_INCL=$(FREETYPE_BASE)/include/freetype2 -+FREETYPE_BASE=/usr/local ++FREETYPE_BASE=${LOCALBASE} +FREETYPE_INCL=-I$(FREETYPE_BASE)/include/freetype2 -I$(FREETYPE_BASE)/include FREETYPE_LIB=$(FREETYPE_BASE)/lib -prefix=/usr -+prefix=/usr/local ++prefix=${PREFIX} - CC=gcc +-CC=gcc -CFLAGS=$(RPM_OPT_FLAGS) -Wall -pedantic -I$(FREETYPE_INCL) -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -pedantic $(FREETYPE_INCL) ++CFLAGS+=$(RPM_OPT_FLAGS) -Wall -pedantic $(FREETYPE_INCL) LDFALGS=-L$(FREETYPE_LIB) -lfreetype -lz all: xttmgr @@ -22,12 +22,12 @@ xttmgr.o: xttmgr.c -@@ -18,7 +18,7 @@ +@@ -18,7 +17,7 @@ -rm -f *.o core xttmgr install: - -install -s -m 755 xttmgr $(DESTDIR)$(prefix)/sbin/xttmgr -+ -install -s -m 755 xttmgr $(DESTDIR)$(prefix)/bin/xttmgr ++ -${BSD_INSTALL_PROGRAM} xttmgr $(DESTDIR)$(prefix)/bin/xttmgr uninstall: -rm -f /usr/sbin/xttmgr |