diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
index 76a4d28b8623..a19ca72ad8b8 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -12,16 +12,18 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses-based front-end for various audio players
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gettext gmake python:2
 
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}"
+NO_ARCH=	yes
 
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/audio/cplay/files/patch-Makefile b/audio/cplay/files/patch-Makefile
index b63e8d3a5d07..40a7e47f5f9f 100644
--- a/audio/cplay/files/patch-Makefile
+++ b/audio/cplay/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.bak	Sun Dec 28 15:51:04 2003
-+++ Makefile	Sun Dec 28 15:51:44 2003
-@@ -14,7 +14,7 @@
+--- Makefile.orig	2003-08-28 12:22:48 UTC
++++ Makefile
+@@ -14,7 +14,7 @@ clean: recursive-clean
  recursive-all recursive-install recursive-clean:
  	@target=$@; \
  	for i in $(SUBDIRS); do \
diff --git a/audio/cplay/files/patch-cplay b/audio/cplay/files/patch-cplay
index e2cd60df74a4..426d77d07b9d 100644
--- a/audio/cplay/files/patch-cplay
+++ b/audio/cplay/files/patch-cplay
@@ -1,7 +1,6 @@
-
---- cplay.orig	2003-12-05 09:20:56.000000000 +0100
-+++ cplay	2008-03-27 00:36:13.000000000 +0100
-@@ -63,7 +63,7 @@
+--- cplay.orig	2003-12-05 08:20:56 UTC
++++ cplay
+@@ -63,7 +63,7 @@ except:
  
  # ------------------------------------------
  XTERM = re.search("rxvt|xterm", os.environ["TERM"])
@@ -10,7 +9,7 @@
  
  # ------------------------------------------
  def which(program):
-@@ -906,11 +906,20 @@
+@@ -906,11 +906,20 @@ class PlaylistWindow(TagListWindow):
  
      def command_change_viewpoint(self, klass=PlaylistEntry):
          if not globals().get("ID3"):
@@ -34,7 +33,7 @@
          TagListWindow.command_change_viewpoint(self, klass)
  
      def get_title(self):
-@@ -962,9 +971,11 @@
+@@ -962,9 +971,11 @@ class PlaylistWindow(TagListWindow):
          try:
              if os.path.isdir(pathname):
                  app.status(_("Working..."))
@@ -47,7 +46,7 @@
              else:
                  pathname = self.fix_url(pathname)
                  self.append(PlaylistEntry(pathname))
-@@ -1301,6 +1312,17 @@
+@@ -1301,6 +1312,17 @@ class TimeOffsetPlayer(Player):
              self.set_position(head, head+tail, [head, tail])
  
  # ------------------------------------------
@@ -65,7 +64,7 @@
  class NoOffsetPlayer(Player):
  
      def parse_buf(self):
-@@ -1334,8 +1356,6 @@
+@@ -1334,8 +1356,6 @@ class Timeout:
  # ------------------------------------------
  class FIFOControl:
      def __init__(self):
@@ -74,7 +73,7 @@
          self.commands = {"pause" : app.toggle_pause,
                           "next" : app.next_song,
                           "prev" : app.prev_song,
-@@ -1346,6 +1366,15 @@
+@@ -1346,6 +1366,15 @@ class FIFOControl:
                           "volup" : app.inc_volume,
                           "voldown" : app.dec_volume,
                           "quit" : app.quit}
@@ -90,7 +89,7 @@
  
      def handle_command(self):
          command = string.strip(self.fd.readline())
-@@ -1419,6 +1448,11 @@
+@@ -1419,6 +1448,11 @@ class Application:
          XTERM and sys.stderr.write("\033]0;%s\a" % "xterm")
          tty and tty.tcsetattr(sys.stdin.fileno(), tty.TCSADRAIN, self.tcattr)
          print
@@ -102,7 +101,7 @@
  
      def run(self):
          while 1:
-@@ -1615,7 +1649,7 @@
+@@ -1615,7 +1649,7 @@ def main():
              if opt == "-v": app.mixer("toggle")
          if args or playlist:
              for i in args or playlist:
@@ -111,7 +110,7 @@
              app.win_tab.change_window()
          app.run()
      except SystemExit:
-@@ -1627,15 +1661,17 @@
+@@ -1627,15 +1661,17 @@ def main():
  
  # ------------------------------------------
  PLAYERS = [
@@ -131,5 +130,3 @@
      ]
  
  def VALID_SONG(name):
-
-