- Switch to USES=localbase

- Pet portlint
- Switch to options helpers
- Update WWW

Approved by:	portmgr blanket

2 files changed, 8 insertions, 16 deletions

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index a383ca34ae6f..fe0c5e056813 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -17,13 +17,13 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libImlib2.so:graphics/imlib2 \
 		libpng.so:graphics/png
 
+USES=		cpe desktop-file-utils gmake localbase:ldflags \
+		perl5 shebangfix tar:bzip2
+SHEBANG_FILES=	cam/feh-cam
 USE_XORG=	x11 xt xinerama
-USES=		cpe desktop-file-utils gmake perl5 shebangfix tar:bzip2
-CPE_VENDOR=	daniel_friesel
 USE_PERL5=	run
+CPE_VENDOR=	daniel_friesel
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}" verscmp=0
 
 OPTIONS_DEFINE=	CAM DOCS EXAMPLES EXIF
@@ -32,18 +32,10 @@ EXIF_DESC=	Support EXIF tags
 OPTIONS_DEFAULT=CAM EXIF
 OPTIONS_SUB=	yes
 
-EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCAM}
-MAKE_ENV+=	cam=1
-SHEBANG_FILES=	${WRKSRC}/cam/feh-cam
-.endif
+CAM_MAKE_ENV=	cam=1
 
-.if ${PORT_OPTIONS:MEXIF}
-MAKE_ENV+=	exif=1
-.endif
+EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
+EXIF_MAKE_ENV=	exif=1
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|install-doc||' \
diff --git a/graphics/feh/pkg-descr b/graphics/feh/pkg-descr
index 20afc935b039..ddab88d95eb1 100644
--- a/graphics/feh/pkg-descr
+++ b/graphics/feh/pkg-descr
@@ -4,4 +4,4 @@ from simple single file viewing, to multiple file modes using
 a slideshow or multiple windows. feh supports the creation of
 montages as index prints with many user-configurable options.
 
-WWW: http://feh.finalrewind.org/
+WWW: https://feh.finalrewind.org/