--- mk/bsd.pkg.mk~	2013-09-07 19:43:56.000000000 +0200
+++ mk/bsd.pkg.mk	2014-01-18 14:16:55.000000000 +0100
@@ -29,19 +29,23 @@
 
 ##### PKGBASE, PKGNAME[_NOREV], PKGVERSION
 
-PKGBASE?=		${PKGNAME:C/-[^-]*$//}
-PKGVERSION?=		${PKGNAME:C/^.*-//}
+PKGBASE?=		${PKGNAME:C/~[^~]*//:C/-[^-]*$//}
+PKGVERSION?=		${PKGNAME:C/~[^~]*//:C/^.*-//}
+PKGTAG?=		${PKG_OPTIONS:C/.+/~/W}${PKG_OPTIONS:ts+}
 .if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
 .  if defined(PKGNAME)
 PKGNAME_NOREV:=		${PKGNAME}
-PKGNAME:=		${PKGNAME}nb${PKGREVISION}
+PKGNAME_NOTAG:=		${PKGNAME}nb${PKGREVISION}
+PKGNAME:=		${PKGNAME}nb${PKGREVISION}${PKGTAG}
 .  else
-PKGNAME?=		${DISTNAME}nb${PKGREVISION}
+PKGNAME?=		${DISTNAME}nb${PKGREVISION}${PKGTAG}
+PKGNAME_NOTAG=		${DISTNAME}nb${PKGREVISION}
 PKGNAME_NOREV=		${DISTNAME}
 .  endif
 .else
-PKGNAME?=		${DISTNAME}
-PKGNAME_NOREV=		${PKGNAME}
+PKGNAME?=		${DISTNAME}${PKGTAG}
+PKGNAME_NOTAG=		${DISTNAME}
+PKGNAME_NOREV=		${PKGNAME_NOTAG}
 .endif
 PKGVERSION_NOREV=	${PKGNAME_NOREV:C/^.*-//}