svn commit: r357834 - head/databases/gdbm

[Johan van Selst]

Author: johans
Date: Sun Jun 15 07:48:46 2014
New Revision: 357834
URL: http://svnweb.freebsd.org/changeset/ports/357834
QAT: https://qat.redports.org/buildarchive/r357834/

Log:
  - Fix package breakage
  - While here, modernise OPTIONS
  - Bump PORTREVISION for plist change
  
  PR:		ports/191016
  Submitted by:	freebsd at nagilum.org

Modified:
  head/databases/gdbm/Makefile
  head/databases/gdbm/pkg-plist

Modified: head/databases/gdbm/Makefile
==============================================================================
--- head/databases/gdbm/Makefile	Sun Jun 15 07:26:48 2014	(r357833)
+++ head/databases/gdbm/Makefile	Sun Jun 15 07:48:46 2014	(r357834)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdbm
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	GNU
 
@@ -21,24 +21,11 @@ MAKE_JOBS_UNSAFE=	yes
 INFO=		gdbm
 
 OPTIONS_DEFINE=	COMPAT NLS
+OPTIONS_SUB=	yes
 COMPAT_DESC=	Enable dbm/ndbm compatibility
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCOMPAT}
-CONFIGURE_ARGS=	--enable-libgdbm-compat
-PLIST_SUB+=	GDBM_COMPAT=""
-.else
-PLIST_SUB+=	GDBM_COMPAT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+COMPAT_CONFIGURE_ENABLE=	libgdbm-compat
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|LIBS = @LIBS@ -lc|LIBS = @LIBS@|" \
@@ -47,9 +34,6 @@ post-patch:
 			${WRKSRC}/Makefile.in
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdbm.so.4
-.if ${PORT_OPTIONS:MCOMPAT}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdbm_compat.so.4
-.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdbm*.so
 
 .include <bsd.port.mk>

Modified: head/databases/gdbm/pkg-plist
==============================================================================
--- head/databases/gdbm/pkg-plist	Sun Jun 15 07:26:48 2014	(r357833)
+++ head/databases/gdbm/pkg-plist	Sun Jun 15 07:48:46 2014	(r357834)
@@ -2,17 +2,18 @@ bin/gdbm_dump
 bin/gdbm_load
 bin/gdbmtool
 include/gdbm.h
-%%GDBM_COMPAT%%include/dbm.h
-%%GDBM_COMPAT%%include/ndbm.h
+%%COMPAT%%include/dbm.h
+%%COMPAT%%include/ndbm.h
 lib/libgdbm.a
 lib/libgdbm.la
 lib/libgdbm.so
 lib/libgdbm.so.4
 lib/libgdbm.so.4.0.0
-%%GDBM_COMPAT%%lib/libgdbm_compat.a
-%%GDBM_COMPAT%%lib/libgdbm_compat.la
-%%GDBM_COMPAT%%lib/libgdbm_compat.so
-%%GDBM_COMPAT%%lib/libgdbm_compat.so.4
+%%COMPAT%%lib/libgdbm_compat.a
+%%COMPAT%%lib/libgdbm_compat.la
+%%COMPAT%%lib/libgdbm_compat.so
+%%COMPAT%%lib/libgdbm_compat.so.4
+%%COMPAT%%lib/libgdbm_compat.so.4.0.0
 man/man1/gdbm_dump.1.gz
 man/man1/gdbm_load.1.gz
 man/man1/gdbmtool.1.gz