diff options
| author | kris <kris@FreeBSD.org> | 2006-12-01 08:09:25 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2006-12-01 08:09:25 +0800 |
| commit | 703a04d5be7874f8350f078ad051dbe73ab56b82 (patch) | |
| tree | bc2f081720389dd8cd06c26122d492509c4bc80f /sysutils | |
| parent | 31c0d77a0b8296187d3d0d285923536ef8d4404f (diff) | |
| download | freebsd-ports-gnome-703a04d5be7874f8350f078ad051dbe73ab56b82.tar.gz freebsd-ports-gnome-703a04d5be7874f8350f078ad051dbe73ab56b82.tar.zst freebsd-ports-gnome-703a04d5be7874f8350f078ad051dbe73ab56b82.zip | |
Respect X11BASE and LOCALBASE
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/asapm/files/patch-Makefile.UNIX | 21 | ||||
| -rw-r--r-- | sysutils/asapm/files/patch-configure | 34 |
2 files changed, 55 insertions, 0 deletions
diff --git a/sysutils/asapm/files/patch-Makefile.UNIX b/sysutils/asapm/files/patch-Makefile.UNIX new file mode 100644 index 000000000000..f7c6d5ef1d83 --- /dev/null +++ b/sysutils/asapm/files/patch-Makefile.UNIX @@ -0,0 +1,21 @@ +--- Makefile.UNIX.orig Thu Nov 30 18:55:09 2006 ++++ Makefile.UNIX Thu Nov 30 18:55:42 2006 +@@ -1,14 +1,14 @@ + #----------------------------------------------------- + # The locations where this program should be installed +-INSTALL_DIR=/usr/local/bin +-MAN_DIR=/usr/local/man/man1 ++INSTALL_DIR=${LOCALBASE}/bin ++MAN_DIR=${LOCALBASE}/man/man1 + + # The location and names of the X11 libraries +-LDIR = -L/usr/X11R6/lib ++LDIR = -L${X11BASE}/lib + LIBS = -lXpm -lX11 + + # The include path to the X11 files +-C_INCLUDE = -I. -I/usr/X11R6/include ++C_INCLUDE = -I. -I${X11BASE}/include + + #----------------------------------------------------- + CC = gcc diff --git a/sysutils/asapm/files/patch-configure b/sysutils/asapm/files/patch-configure new file mode 100644 index 000000000000..a8c07269640e --- /dev/null +++ b/sysutils/asapm/files/patch-configure @@ -0,0 +1,34 @@ +--- configure.orig Thu Nov 30 19:05:04 2006 ++++ configure Thu Nov 30 19:04:44 2006 +@@ -1289,6 +1289,7 @@ + # Look for the header file in a standard set of common directories. + # Check X11 before X11Rn because it is often a symlink to the current release. + for ac_dir in \ ++ ${X11BASE}/include \ + /usr/X11/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ +@@ -1364,6 +1365,7 @@ + # First see if replacing the include by lib works. + # Check X11 before X11Rn because it is often a symlink to the current release. + for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ ++ ${X11BASE}/lib \ + /usr/X11/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ +@@ -2289,6 +2291,7 @@ + rm -rf conftest* + # Look for the header file in a standard set of common directories. + for ac_dir in \ ++ ${X11BASE}/include \ + /usr/X11/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ +@@ -2368,6 +2371,7 @@ + # First see if replacing the include by lib works. + for ac_dir in \ + `echo "$vt_xpm_includes" | sed 's,include/X11,lib,;s,include,lib,'` \ ++ ${X11BASE}/lib \ + /usr/X11/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ |