diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-02-04 00:39:49 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-02-04 00:39:49 +0000 |
| commit | 686d9ae7e56316c97d05e2d0f9d8d99045f365d0 (patch) | |
| tree | f729d0e40a130e707f1add1e23f81850e42418a7 /net/rdesktop | |
| parent | Remove obsolete personal homepage. (diff) | |
Add missing patches from ports/47715, remove ALL_TARGET from Makefile.
PR: 47715
Noticed by: maintainer
Notes
Notes:
svn path=/head/; revision=74604
Diffstat (limited to 'net/rdesktop')
| -rw-r--r-- | net/rdesktop/Makefile | 2 | ||||
| -rw-r--r-- | net/rdesktop/files/patch-Makefile | 35 | ||||
| -rw-r--r-- | net/rdesktop/files/patch-configure | 23 |
3 files changed, 58 insertions, 2 deletions
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile index d37ec976353c..48fb30c99b84 100644 --- a/net/rdesktop/Makefile +++ b/net/rdesktop/Makefile @@ -20,8 +20,6 @@ USE_OPENSSL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -ALL_TARGET= rdesktop - MAN1= rdesktop.1 do-install: diff --git a/net/rdesktop/files/patch-Makefile b/net/rdesktop/files/patch-Makefile new file mode 100644 index 000000000000..bb73c79c6e42 --- /dev/null +++ b/net/rdesktop/files/patch-Makefile @@ -0,0 +1,35 @@ +--- Makefile.orig Thu Jan 30 21:54:23 2003 ++++ Makefile Fri Jan 31 18:22:58 2003 +@@ -20,6 +20,8 @@ + include Makeconf # configure-generated + + ++all: rdesktop ++ + rdesktop: $(RDPOBJ) $(CRYPTOBJ) + $(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) + +@@ -29,23 +31,10 @@ + install: installbin installkeymaps installman + + installbin: rdesktop +- mkdir -p $(DESTDIR)/$(bindir) +- install rdesktop $(DESTDIR)/$(bindir) +- strip $(DESTDIR)/$(bindir)/rdesktop +- chmod 755 $(DESTDIR)/$(bindir)/rdesktop + + installman: doc/rdesktop.1 +- mkdir -p $(DESTDIR)/$(mandir)/man1 +- cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1 +- chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1 + + installkeymaps: +- mkdir -p $(DESTDIR)/$(KEYMAP_PATH) +-# Prevent copying the CVS directory +- cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH) +- cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH) +- cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH) +- chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/* + + proto: + cproto -DMAKE_PROTO -o proto.h *.c diff --git a/net/rdesktop/files/patch-configure b/net/rdesktop/files/patch-configure new file mode 100644 index 000000000000..6c0685a2866b --- /dev/null +++ b/net/rdesktop/files/patch-configure @@ -0,0 +1,23 @@ +--- configure.orig Thu Jan 30 21:54:48 2003 ++++ configure Fri Jan 31 18:43:58 2003 +@@ -98,7 +98,7 @@ + echo "CC = $cc" >>Makeconf + + if $cc -v 2>&1 |grep '^gcc' >/dev/null; then +- cflags="$cflags -Wall -O2" ++ #cflags="$cflags -Wall -O2" + else + cflags="$cflags -O" + fi +@@ -220,8 +220,9 @@ + esac + + +-echo "CFLAGS = $cflags" >>Makeconf +-echo "LDFLAGS = $ldflags" >>Makeconf ++echo "CFLAGS += $cflags" >>Makeconf ++echo "LDFLAGS += $ldflags" >>Makeconf ++echo 'DESTDIR = ${prefix}' >>Makeconf + + echo "configure complete - now run make" + |