4 files changed, 15 insertions, 32 deletions

diff --git a/print/pdq/Makefile b/print/pdq/Makefile
index 87627a709f6e..4d4b8ad18441 100644
--- a/print/pdq/Makefile
+++ b/print/pdq/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pdq
 PORTVERSION=	2.2.1
 CATEGORIES=	print
-MASTER_SITES=	ftp://feynman.tam.uiuc.edu/pub/pdq/
+MASTER_SITES=	http://pdq.sourceforge.net/ftp/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
@@ -21,11 +21,9 @@ MAN1=		lpd_cancel.1 lpd_print.1 lpd_status.1 pdq.1 xpdq.1
 MAN5=		printrc.5
 
 post-install:
-	strip ${PREFIX}/bin/pdq
-	strip ${PREFIX}/bin/xpdq
-	strip ${PREFIX}/bin/lpd_cancel
-	strip ${PREFIX}/bin/lpd_print
-	strip ${PREFIX}/bin/lpd_status
+.for file in lpd_cancel lpd_print lpd_status pdq xpdq
+	@strip ${PREFIX}/bin/${file}
+.endfor
 	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/pdq/files/patch-af b/print/pdq/files/patch-af
index 532e2726ee9f..44a40699b435 100644
--- a/print/pdq/files/patch-af
+++ b/print/pdq/files/patch-af
@@ -1,12 +1,6 @@
---- src/xpdq_printer.c.orig	Sat May 15 07:19:13 1999
-+++ src/xpdq_printer.c	Sat May 15 11:43:47 1999
-@@ -29,23 +29,30 @@
- #include "printer.h"
- #include "argument.h"
- 
-+#define PRINTRC "/usr/local/etc/printrc"
-+
- void xpdq_add_printer (void) {
+--- src/xpdq_printer.c.orig	Sat Apr  1 05:36:30 2000
++++ src/xpdq_printer.c	Fri Aug 11 22:36:57 2000
+@@ -33,19 +33,24 @@
  
     pwizard_state *wizard;
     dl_list *list;
@@ -20,7 +14,7 @@
 +      error = malloc(256);
 +      sprintf (error, "There are no printer drivers defined in\n"
 +         "%s or ~/.printrc.  Without printer drivers,\n"
-+	 "the wizard cannot add printers.", PRINTRC);
++	 "the wizard cannot add printers.", PRINTRC_FILE);
 +      xpdq_error(error);
        return;
     }
@@ -32,7 +26,7 @@
 +      error = malloc(256);
 +      sprintf (error, "There are no printer drivers defined in\n"
 +         "%s or ~/.printrc.  Without printer drivers,\n"
-+	 "the wizard cannot add printers.", PRINTRC);
++	 "the wizard cannot add printers.", PRINTRC_FILE);
 +      xpdq_error(error);
        return;
     }
diff --git a/print/pdq/files/patch-ag b/print/pdq/files/patch-ag
index 3ce08476c57b..f904a2fd58e0 100644
--- a/print/pdq/files/patch-ag
+++ b/print/pdq/files/patch-ag
@@ -1,15 +1,6 @@
---- src/xpdq_wizard.c.orig	Sat May 15 11:45:15 1999
-+++ src/xpdq_wizard.c	Sat May 15 11:50:44 1999
-@@ -29,6 +29,8 @@
- #include "printer.h"
- #include "argument.h"
- 
-+#define PRINTRC "/usr/local/etc/printrc"
-+
- pwizard_state *new_pwizard() {
- 
-    pwizard_state *wizard;
-@@ -315,6 +317,7 @@
+--- src/xpdq_wizard.c.orig	Sat Apr  1 05:36:30 2000
++++ src/xpdq_wizard.c	Fri Aug 11 22:37:29 2000
+@@ -315,6 +315,7 @@
     driver *d;
     int i, row;
     char *dname;
@@ -17,7 +8,7 @@
  
     panel = gtk_vbox_new (FALSE, 0);
     gtk_container_border_width (GTK_CONTAINER (panel), 10);
-@@ -348,9 +351,11 @@
+@@ -348,9 +349,11 @@
     gtk_clist_set_selection_mode (GTK_CLIST(widget), GTK_SELECTION_BROWSE);
     list = first_list_element (rc->driver_list);
     if (list == NULL) {
@@ -27,7 +18,7 @@
 +      error = malloc(256);
 +      sprintf(error, "This system has no drivers.  Please make sure\n"
 +         "that there are drivers defined in %s, ~/.printrc,\n"
-+	 "or in files included by %s or ~/.printrc.", PRINTRC, PRINTRC);
++	 "or in files included by %s or ~/.printrc.", PRINTRC_FILE, PRINTRC_FILE);
 +      xpdq_error(error);
     }
     while (list != NULL) {
diff --git a/print/pdq/pkg-descr b/print/pdq/pkg-descr
index ee9e17d3fe33..bb596fb1280e 100644
--- a/print/pdq/pkg-descr
+++ b/print/pdq/pkg-descr
@@ -10,7 +10,7 @@ o Scripts can be embedded in the rc files.
 o Custom command-line options.
 o Root privileges not required.
 
-WWW: http://feynman.tam.uiuc.edu/pdq/introduction.html
+WWW: http://pdq.sourceforge.net/
 
 - Yin-Jieh Chen
 yinjieh@csie.nctu.edu.tw