diff options
| author | tg <tg@FreeBSD.org> | 1997-01-14 07:16:30 +0000 |
|---|---|---|
| committer | tg <tg@FreeBSD.org> | 1997-01-14 07:16:30 +0000 |
| commit | 45ff5e587ea9e620c3240f59ed7bea2d7ba0bdae (patch) | |
| tree | 2472a412b5164b95667331b251d24dc5090b343a /x11/xlockmore | |
| parent | f280dd04fb9cf9f04c37539dd70349105c3de457 (diff) | |
| download | FreeBSD-ports-45ff5e587ea9e620c3240f59ed7bea2d7ba0bdae.zip FreeBSD-ports-45ff5e587ea9e620c3240f59ed7bea2d7ba0bdae.tar.gz | |
Use flag-freebsd.h, submitted by Philippe Regnauld <regnauld@deepo.prosa.dk>.
Diffstat (limited to 'x11/xlockmore')
| -rw-r--r-- | x11/xlockmore/Makefile | 3 | ||||
| -rw-r--r-- | x11/xlockmore/files/patch-aa | 20 |
2 files changed, 20 insertions, 3 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index cb92d40c..bcbcb7b 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -17,4 +17,7 @@ LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm USE_IMAKE= yes +post-extract: + @cp ${FILESDIR}/flag-freebsd.h ${WRKSRC}/flags + .include <bsd.port.mk> diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-aa index 06e6a56..3fb99bf 100644 --- a/x11/xlockmore/files/patch-aa +++ b/x11/xlockmore/files/patch-aa @@ -1,5 +1,5 @@ --- Imakefile.orig Wed Dec 11 18:36:32 1996 -+++ Imakefile Wed Jan 8 20:07:52 1997 ++++ Imakefile Thu Jan 9 18:17:25 1997 @@ -17,13 +17,13 @@ XCOMM If you get an error "Cannot find xpm.h" while compiling, set @@ -16,7 +16,21 @@ #endif -@@ -329,9 +329,9 @@ +@@ -255,7 +255,12 @@ + PIXMAPTYPE = x11 + FLAGTYPE = sysv + #else +-#if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(i386BsdArchitecture) ++#if defined(FreeBSDArchitecture) ++ SLEEPDEF = -DHAS_USLEEP ++ BITMAPTYPE = bsd ++ PIXMAPTYPE = bsd ++ FLAGTYPE = freebsd ++#elif defined(NetBSDArchitecture) || defined(i386BsdArchitecture) + SLEEPDEF = -DHAS_USLEEP + BITMAPTYPE = bsd + PIXMAPTYPE = bsd +@@ -329,9 +334,9 @@ XCOMM -DSTAFF_NETGROUP=\"/etc/xlock.netgroup\" netgroup that is exempt XCOMM May have to combine in one long line if "+=" does not work @@ -28,7 +42,7 @@ XCOMM OPTDEF += -DMULTIPLE_ROOT XCOMM OPTDEF += -DOLD_EVENT_LOOP XCOMM 0PTDEF += -DUSE_XLOCKRC -@@ -357,8 +357,8 @@ +@@ -357,8 +362,8 @@ IMAGEBITMAP = $(MEDIUMBITMAP) XCOMM IMAGEBITMAP = l-bob XCOMM IMAGEBITMAP = m-xlock |
