diff --git a/x11-wm/obpager/Makefile b/x11-wm/obpager/Makefile
index 8866453c1e4b..a401a9d7c676 100644
--- a/x11-wm/obpager/Makefile
+++ b/x11-wm/obpager/Makefile
@@ -1,31 +1,38 @@
 PORTNAME=	obpager
 PORTVERSION=	1.8
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight pager for netwm compatible window managers
 WWW=		https://obpager.sourceforge.net/
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+DEPRECATED=	Last upstream release was in 2004
+EXPIRATION_DATE=	2024-01-18
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 
 USES=		compiler gmake xorg
 USE_CXXSTD=	c++14
 USE_XORG=	x11 xext
 
+MAKE_ARGS=	CDEFS="${CXXFLAGS}"
+
 CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
 CXXFLAGS_clang=	-Wno-c++11-narrowing
-MAKE_ARGS=	CDEFS="${CXXFLAGS}"
+
 PLIST_FILES=	bin/${PORTNAME}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \
 	    s|%%LOCALBASE%%|${LOCALBASE}|g; \
 	    s|%%CXX%%|${CXX}|g; \
 	    s|sed|gsed|g' ${WRKSRC}/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-wm/obpager/files/patch-Makefile b/x11-wm/obpager/files/patch-Makefile
index 165656efac06..1aa3adfe8db6 100644
--- a/x11-wm/obpager/files/patch-Makefile
+++ b/x11-wm/obpager/files/patch-Makefile
@@ -1,25 +1,25 @@
---- Makefile.orig	2009-03-07 18:16:51.000000000 +0100
-+++ Makefile	2009-03-07 18:19:50.000000000 +0100
-@@ -7,18 +7,18 @@
+--- Makefile.orig	2004-09-01 14:23:44 UTC
++++ Makefile
+@@ -7,18 +7,18 @@ DEPDIR = ./deps
  
  
  # Set the install directory for the executable
 -INSTALLDIR = /usr/local/bin
 +INSTALLDIR = %%PREFIX%%/bin
  
  
  # Set the compilation flags and such
 -CXX = g++
 +CXX = %%CXX%%
  CDEFS = -D_REENTRANT
  CPPFLAGS = -ggdb -Wall
  #CPPFLAGS = -ggdb -Wall -O2
 -INCLUDES = -I/usr/X11R6/include/X11 -I/usr/X11R6/include/X11/extensions -I./src
 +INCLUDES = -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/X11 -I%%LOCALBASE%%/include/X11/extensions -I./src
  COMPILE = $(CXX) $(CDEFS) $(INCLUDES) $(CPPFLAGS)
  LINK = $(CXX) $(LDFLAGS) $(LDLIBS)
 -LDLIBS = -L/usr/X11R6/lib  -lX11 -lXext
 +LDLIBS = -L%%LOCALBASE%%/lib  -lX11 -lXext
  
  
  
diff --git a/x11-wm/obpager/files/patch-src_OBPager.cc b/x11-wm/obpager/files/patch-src_OBPager.cc
index 5cedde9ee0f1..1d74eab310fb 100644
--- a/x11-wm/obpager/files/patch-src_OBPager.cc
+++ b/x11-wm/obpager/files/patch-src_OBPager.cc
@@ -1,20 +1,20 @@
---- src/OBPager.cc.orig	2014-02-14 15:35:01.000000000 +0100
-+++ src/OBPager.cc	2014-02-14 15:39:12.000000000 +0100
-@@ -159,7 +159,7 @@
+--- src/OBPager.cc.orig	2004-09-01 14:23:44 UTC
++++ src/OBPager.cc
+@@ -159,7 +159,7 @@ OBPager::~OBPager()
   * @param displayName is the name of the display to connect to
   */
  
 -void OBPager::connectToXServer(char *displayName)
 +void OBPager::connectToXServer(const char *displayName)
  {
  	// Connect to the user-specified desktop or whatever is in $DISPLAY?
  	
-@@ -301,7 +301,7 @@
+@@ -301,7 +301,7 @@ void OBPager::createShowWindow()
  	int maxHeight = height;
  	int minWidth = width;
  	int minHeight = height;
 -	char* appName = APPLET_NAME;
 +	char appName[] = APPLET_NAME;
  	unsigned long borderColour = BlackPixel(mDisplay(), mScreenNum);
  	unsigned long backgroundColour = BlackPixel(mDisplay(), mScreenNum);
  	
diff --git a/x11-wm/obpager/files/patch-src_OBPager.h b/x11-wm/obpager/files/patch-src_OBPager.h
index 1c81d47f97e0..05d245f86d82 100644
--- a/x11-wm/obpager/files/patch-src_OBPager.h
+++ b/x11-wm/obpager/files/patch-src_OBPager.h
@@ -1,11 +1,11 @@
---- src/OBPager.h.orig	2014-02-14 15:36:36.000000000 +0100
-+++ src/OBPager.h	2014-02-14 15:37:08.000000000 +0100
-@@ -63,7 +63,7 @@
+--- src/OBPager.h.orig	2004-09-01 14:23:44 UTC
++++ src/OBPager.h
+@@ -63,7 +63,7 @@ class OBPager
  		~OBPager();
  		
  		/// Connect to a specified X server display, or the default display
 -		void connectToXServer(char *displayName = NULL);
 +		void connectToXServer(const char *displayName = NULL);
  		
  		/// Create and show the X window
  		void createShowWindow();
diff --git a/x11-wm/obpager/files/patch-src_main.cc b/x11-wm/obpager/files/patch-src_main.cc
index f962dc810c7a..83ac9f7d4842 100644
--- a/x11-wm/obpager/files/patch-src_main.cc
+++ b/x11-wm/obpager/files/patch-src_main.cc
@@ -1,10 +1,10 @@
---- src/main.cc.orig	2009-03-07 18:24:50.000000000 +0100
-+++ src/main.cc	2009-03-07 18:24:58.000000000 +0100
+--- src/main.cc.orig	2004-09-01 14:23:44 UTC
++++ src/main.cc
 @@ -26,6 +26,7 @@
  
  #include <sys/types.h>
  #include <unistd.h>
 +#include <errno.h>
  
  
  // Include the headers for the pager class and also the spiffy custom exception class