Attachment #36684 for bug #58703

View | Details | Raw Unified | Return to bug 58703
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= rdesktop	8	PORTNAME= rdesktop
9	PORTVERSION= 1.2.0	9	PORTVERSION= 1.3.0
10	CATEGORIES= net comms	10	CATEGORIES= net comms
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 19-25 Link Here
19	USE_OPENSSL= yes	19	USE_OPENSSL= yes
20	HAS_CONFIGURE= yes	20	HAS_CONFIGURE= yes
21	CONFIGURE_ARGS= --prefix=${PREFIX}	21	CONFIGURE_ARGS= --prefix=${PREFIX}
22	CFLAGS+= -DSAVE_LICENSE	22	WRKSRC= ${WRKDIR}/rdesktop
23		23
24	MAN1= rdesktop.1	24	MAN1= rdesktop.1
25		25

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (rdesktop-1.2.0.tar.gz) = b5e108e83e9de883e965a2bb0c7e7036	1	MD5 (rdesktop-1.3.0.tar.gz) = d8108781d227221a823c34b861486a5d




bin/rdesktop
share/rdesktop/keymaps/pt-br
share/rdesktop/keymaps/fr-ch
share/rdesktop/keymaps/fr-be
share/rdesktop/keymaps/fr-ca
share/rdesktop/keymaps/en-us
share/rdesktop/keymaps/en-gb
share/rdesktop/keymaps/de-ch
share/rdesktop/keymaps/tr
share/rdesktop/keymaps/th
share/rdesktop/keymaps/sv

share/rdesktop/keymaps/lt
share/rdesktop/keymaps/ja
share/rdesktop/keymaps/it
share/rdesktop/keymaps/hu
share/rdesktop/keymaps/hr
share/rdesktop/keymaps/fr
share/rdesktop/keymaps/fo
share/rdesktop/keymaps/fi
share/rdesktop/keymaps/es
share/rdesktop/keymaps/de
share/rdesktop/keymaps/da
share/rdesktop/keymaps/ar
share/rdesktop/keymaps/common
share/rdesktop/keymaps/convert-map
share/rdesktop/keymaps/modifiers




--- 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

Lines 1-6 Link Here

(-)files/patch-configure (-5 / +5 lines)
1	--- configure.orig Thu Jan 30 21:54:48 2003	1	--- configure.orig Wed Oct 29 23:49:52 2003
2	+++ configure Fri Jan 31 18:43:58 2003	2	+++ configure Thu Oct 30 11:04:20 2003
3	@@ -98,7 +98,7 @@	3	@@ -115,7 +115,7 @@
4	echo "CC = $cc" >>Makeconf	4	echo "CC = $cc" >>Makeconf
5		5
6	if $cc -v 2>&1 \|grep '^gcc' >/dev/null; then	6	if $cc -v 2>&1 \|grep '^gcc' >/dev/null; then
Lines 9-15 Link Here
9	else	9	else
10	cflags="$cflags -O"	10	cflags="$cflags -O"
11	fi	11	fi
12	@@ -220,8 +220,9 @@	12	@@ -291,9 +291,9 @@
13	esac	13	esac
14		14
15		15
Lines 17-23 Link Here
17	-echo "LDFLAGS = $ldflags" >>Makeconf	17	-echo "LDFLAGS = $ldflags" >>Makeconf
18	+echo "CFLAGS += $cflags" >>Makeconf	18	+echo "CFLAGS += $cflags" >>Makeconf
19	+echo "LDFLAGS += $ldflags" >>Makeconf	19	+echo "LDFLAGS += $ldflags" >>Makeconf
20	+echo 'DESTDIR = ${prefix}' >>Makeconf	20	echo "TARGETS = $targets" >>Makeconf
21		21
22	echo "configure complete - now run make"	22	echo "configure complete - now run make"

Return to bug 58703

Lines 1-8 Link Here

(-)pkg-plist (-2 / +7 lines)
1	bin/rdesktop	1	bin/rdesktop
2	share/rdesktop/keymaps/ar	2	share/rdesktop/keymaps/pt-br
		3	share/rdesktop/keymaps/fr-ch
3	share/rdesktop/keymaps/fr-be	4	share/rdesktop/keymaps/fr-be
		5	share/rdesktop/keymaps/fr-ca
4	share/rdesktop/keymaps/en-us	6	share/rdesktop/keymaps/en-us
5	share/rdesktop/keymaps/en-gb	7	share/rdesktop/keymaps/en-gb
		8	share/rdesktop/keymaps/de-ch
6	share/rdesktop/keymaps/tr	9	share/rdesktop/keymaps/tr
7	share/rdesktop/keymaps/th	10	share/rdesktop/keymaps/th
8	share/rdesktop/keymaps/sv	11	share/rdesktop/keymaps/sv
Lines 16-28 Link Here
16	share/rdesktop/keymaps/lt	19	share/rdesktop/keymaps/lt
17	share/rdesktop/keymaps/ja	20	share/rdesktop/keymaps/ja
18	share/rdesktop/keymaps/it	21	share/rdesktop/keymaps/it
		22	share/rdesktop/keymaps/hu
19	share/rdesktop/keymaps/hr	23	share/rdesktop/keymaps/hr
20	share/rdesktop/keymaps/fr	24	share/rdesktop/keymaps/fr
		25	share/rdesktop/keymaps/fo
21	share/rdesktop/keymaps/fi	26	share/rdesktop/keymaps/fi
22	share/rdesktop/keymaps/es	27	share/rdesktop/keymaps/es
23	share/rdesktop/keymaps/de	28	share/rdesktop/keymaps/de
24	share/rdesktop/keymaps/da	29	share/rdesktop/keymaps/da
25	share/rdesktop/keymaps/pt-br	30	share/rdesktop/keymaps/ar
26	share/rdesktop/keymaps/common	31	share/rdesktop/keymaps/common
27	share/rdesktop/keymaps/convert-map	32	share/rdesktop/keymaps/convert-map
28	share/rdesktop/keymaps/modifiers	33	share/rdesktop/keymaps/modifiers

Removed Link Here

(-)files/patch-Makefile (-35 lines)
1	--- Makefile.orig Thu Jan 30 21:54:23 2003
2	+++ Makefile Fri Jan 31 18:22:58 2003
3	@@ -20,6 +20,8 @@
4	include Makeconf # configure-generated
5
6
7	+all: rdesktop
8	+
9	rdesktop: $(RDPOBJ) $(CRYPTOBJ)
10	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
11
12	@@ -29,23 +31,10 @@
13	install: installbin installkeymaps installman
14
15	installbin: rdesktop
16	- mkdir -p $(DESTDIR)/$(bindir)
17	- install rdesktop $(DESTDIR)/$(bindir)
18	- strip $(DESTDIR)/$(bindir)/rdesktop
19	- chmod 755 $(DESTDIR)/$(bindir)/rdesktop
20
21	installman: doc/rdesktop.1
22	- mkdir -p $(DESTDIR)/$(mandir)/man1
23	- cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
24	- chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
25
26	installkeymaps:
27	- mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
28	-# Prevent copying the CVS directory
29	- cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
30	- cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
31	- cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
32	- chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
33
34	proto:
35	cproto -DMAKE_PROTO -o proto.h *.c