diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-11 08:47:26 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-11 08:47:26 +0000 |
| commit | 5a763f79849c2843545998381127eb2344ddc5fb (patch) | |
| tree | 55214b990d0742739dbc3240d0557cbbaa384dcd /deskutils/plan | |
| parent | be1956cb82b784cbd12e9da2b752440a3294a841 (diff) | |
| download | ports-5a763f79849c2843545998381127eb2344ddc5fb.tar.gz ports-5a763f79849c2843545998381127eb2344ddc5fb.zip | |
- Respect X11BASE
Approved by: portmgr (linimon)
Notes
Notes:
svn path=/head/; revision=179478
Diffstat (limited to 'deskutils/plan')
| -rw-r--r-- | deskutils/plan/files/patch-Makefile | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/deskutils/plan/files/patch-Makefile b/deskutils/plan/files/patch-Makefile index da65ee582ea8..905fc5a5f302 100644 --- a/deskutils/plan/files/patch-Makefile +++ b/deskutils/plan/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Feb 6 19:11:34 2005 -+++ Makefile Thu May 11 03:00:53 2006 +--- Makefile.orig Mon Feb 7 03:11:34 2005 ++++ Makefile Mon Dec 11 16:30:57 2006 @@ -8,19 +8,19 @@ # after "=", this is parsed and rewritten by the configure script. # @@ -59,6 +59,15 @@ # # what to do without make arguments DEFTARGET=linux #------------------------- end of configuration section ---------------------- +@@ -139,7 +143,7 @@ + BSDIG_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi + NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ + -DNO_MOTIF +-FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ ++FBSD_C = -ansi -I$(X11BASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ + -DSTDLIBMALLOC + OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ + -DNO_MOTIF -DSTDLIBMALLOC @@ -219,10 +223,10 @@ BSDIG_L2= -L/usr/X11/lib -lc NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 @@ -91,4 +100,17 @@ + $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(DOCS)\" $< util.o: util.c $(MAKEFILE) - $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(EXAMPLESDIR)\" $< + $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< +@@ -600,10 +604,10 @@ + LIST = README HISTORY holiday/* language/* misc/* src/resources.h.bigfonts web/* + SRC = Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure + +-LDIR = /usr/X11R6/lib ++LDIR = $(X11BASE)/lib + BINDIR = plan-$(VERSION) + gMYCC = gcc +-gCF = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX ++gCF = -I$(X11BASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX + gL1F = -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11 + gL2F = -lc + |